Version bump, removed old 0.3.5 patch.

Package-Manager: portage-2.0.52-r1

5 files changed, 57 insertions, 215 deletions

diff --git a/x11-misc/idesk/ChangeLog b/x11-misc/idesk/ChangeLog
index 9fa8475e7f60..5f2ac168b483 100644
--- a/x11-misc/idesk/ChangeLog
+++ b/x11-misc/idesk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/idesk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/ChangeLog,v 1.31 2005/09/17 02:01:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/ChangeLog,v 1.32 2005/09/25 17:15:10 nelchael Exp $
+
+*idesk-0.7.4 (25 Sep 2005)
+
+  25 Sep 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/idesk-0.3.5-clickbox-and-singleclick.patch, +idesk-0.7.4.ebuild:
+  Version bump, removed old 0.3.5 patch.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> idesk-0.5.6.ebuild:
   Mark 0.5.6 stable on alpha
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index 54e004ac08a2..642ee15dacc5 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1,11 +1,12 @@
-MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 bda56969e24d768a8d4b17d0d43b019f ChangeLog 4652
-MD5 f2d95dda422d93aa01721baa62137a58 idesk-0.5.6.ebuild 1171
 MD5 8c7fd6f84aebcdef7c84d3995c655a97 idesk-0.7.3-r1.ebuild 1044
+MD5 f2d95dda422d93aa01721baa62137a58 idesk-0.5.6.ebuild 1171
+MD5 dbdf8080e190a711569823c37a7f7c61 ChangeLog 4849
+MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
+MD5 c24a4811efbe436bb14c61143903b29e idesk-0.7.4.ebuild 1044
+MD5 5e31e5eb7d0cfc2bc90454a7f4354605 files/digest-idesk-0.5.6 62
+MD5 b0f0dd588dfad60594b8bb6d34ff5248 files/digest-idesk-0.7.4 64
 MD5 e6dbe5d03053f90f9af131a2af23a5b3 files/digest-idesk-0.7.3-r1 63
+MD5 d6f779298131bfbc97f59b71dea6e5ce files/ideskrc05.5 7091
 MD5 936075c618affeca8533c3ecab323871 files/idesk.1 2485
-MD5 7391b893cc28213bef73f7f929155698 files/ideskrc.5 2329
 MD5 681d0e14514c589e16568398b9eeecd0 files/idesk05.1 4844
-MD5 8b29339fdf933c6dfac6f605f3b306e4 files/idesk-0.3.5-clickbox-and-singleclick.patch 6762
-MD5 d6f779298131bfbc97f59b71dea6e5ce files/ideskrc05.5 7091
-MD5 5e31e5eb7d0cfc2bc90454a7f4354605 files/digest-idesk-0.5.6 62
+MD5 7391b893cc28213bef73f7f929155698 files/ideskrc.5 2329
diff --git a/x11-misc/idesk/files/digest-idesk-0.7.4 b/x11-misc/idesk/files/digest-idesk-0.7.4
new file mode 100644
index 000000000000..0c209d317028
--- /dev/null
+++ b/x11-misc/idesk/files/digest-idesk-0.7.4
@@ -0,0 +1 @@
+MD5 7e11b0b5cc181e74616e24600b354698 idesk-0.7.4.tar.bz2 156141
diff --git a/x11-misc/idesk/files/idesk-0.3.5-clickbox-and-singleclick.patch b/x11-misc/idesk/files/idesk-0.3.5-clickbox-and-singleclick.patch
deleted file mode 100644
index 3faa33b87128..000000000000
--- a/x11-misc/idesk/files/idesk-0.3.5-clickbox-and-singleclick.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff -ru idesk-0.3.5/Desk.cc idesk-0.3.5-simeng/Desk.cc
---- idesk-0.3.5/Desk.cc	2002-11-09 19:06:16.000000000 +0100
-+++ idesk-0.3.5-simeng/Desk.cc	2003-02-14 02:56:30.000000000 +0100
-@@ -100,7 +100,12 @@
-     
-     if( HighContrast )
-       Back.color.alpha = 21845;
--    
-+
-+    if ( !strcmp( (char*)Config->Query( "DoubleClick" ).c_str(), "true" ) )
-+      DoubleClick = true;
-+    else
-+      DoubleClick = false;
-+
-     Transparency = atoi( (char*)Config->Query( "Transparency" ).c_str() );
-     
-     if( !strcmp( ( char * )Config->Query( "Locked" ).c_str(), "true" ) ) LockDesk();
-@@ -123,13 +128,22 @@
-       for(int i=0; i<FileCount; i++) {
-         FileName = DirName + Files[i]->d_name;
-         IconDb = new Database(FileName);
--        if(!(IconTb = IconDb->Query("Icon")))
-+
-+        if(IconDb->Tables.size() == 0)
- 	{
- 		free( Files[ i ] );
- 		delete IconDb;
- 		continue;
- 	}
--        AddIcon( (char*)FileName.c_str(), (char*)IconTb->Query("Icon").c_str(), (char*)IconTb->Query("Caption").c_str(), (char*)IconTb->Query("Command").c_str(), atoi(IconTb->Query("X").c_str()), atoi(IconTb->Query("Y").c_str()) );
-+        for (int y=0; y<IconDb->Tables.size(); y++) {
-+          IconTb = IconDb->Tables[y];
-+          AddIcon( (char*)FileName.c_str(), 
-+            (char*)IconTb->Query("Icon").c_str(), 
-+            (char*)IconTb->Query("Caption").c_str(), 
-+            (char*)IconTb->Query("Command").c_str(), 
-+            atoi(IconTb->Query("X").c_str()), 
-+            atoi(IconTb->Query("Y").c_str()) );
-+        }
- 	free( Files[ i ] );
-         delete IconDb;
- 	delete IconTb;
-@@ -151,12 +165,20 @@
-     char     Num[10];
- 
-       IconDb = new Database(I->FileName);
--        if(!(IconTb = IconDb->Query("Icon"))) return;
--        sprintf(Num, "%d", I->X);
--        IconTb->Set("X", Num);
--        sprintf(Num, "%d", I->Y);
--        IconTb->Set("Y", Num);
-+        if(IconDb->Tables.size() == 0) return;
-+
-+        for (int i=0; i<IconDb->Tables.size(); i++) {
-+          IconTb = IconDb->Tables[i];
-+          if (IconTb->Query("Caption") == I->Caption)
-+          {
-+            sprintf(Num, "%d", I->X);
-+            IconTb->Set("X", Num);
-+            sprintf(Num, "%d", I->Y);
-+            IconTb->Set("Y", Num);
-+          }
-+        }
-         IconDb->Write();
-+        delete IconTb;
-         delete IconDb;
-   }
- 
-@@ -292,6 +314,10 @@
-     return( Transparency );
-   }
- 
-+  bool Desk::GetDoubleClick( ) {
-+    return( DoubleClick );
-+  }
-+
-   bool Desk::GetContrast( ) {
-     return( HighContrast );
-   }
-diff -ru idesk-0.3.5/Desk.h idesk-0.3.5-simeng/Desk.h
---- idesk-0.3.5/Desk.h	2002-11-09 19:06:16.000000000 +0100
-+++ idesk-0.3.5-simeng/Desk.h	2003-02-14 02:47:20.000000000 +0100
-@@ -24,6 +24,7 @@
-        bool Locked;
-        bool HighContrast;
-        bool ShadowFlag;
-+       bool DoubleClick;
-        int ShadowX;
-        int ShadowY;
-        int BoldVal;
-@@ -44,6 +45,7 @@
-        void SaveIcon( Icon *I );
-        void Loop();
-        int  GetTransparency( );
-+       bool GetDoubleClick( );
-        bool GetContrast( );
-        bool GetShadow(int &x, int &y );
- 
-diff -ru idesk-0.3.5/Icon.cc idesk-0.3.5-simeng/Icon.cc
---- idesk-0.3.5/Icon.cc	2002-11-09 19:06:16.000000000 +0100
-+++ idesk-0.3.5-simeng/Icon.cc	2003-02-14 02:57:27.000000000 +0100
-@@ -73,14 +73,11 @@
-       
-       for( int i=0, a=0; i<(3*Width*Height); i+=3, a++) {
-          int alevel = ( (alpha_levels != 0) ? alpha_levels[a] : 255 );
--         if( alevel == 0 ) { bgrgb[i] = bgrgb[i+2] = 255; bgrgb[i+1] = 0; continue; }
-          bgrgb[i+0] = (bgrgb[i+0] * (255-alevel))/255 + (rgb[i+0] * alevel)/255;
-          bgrgb[i+1] = (bgrgb[i+1] * (255-alevel))/255 + (rgb[i+1] * alevel)/255;
-          bgrgb[i+2] = (bgrgb[i+2] * (255-alevel))/255 + (rgb[i+2] * alevel)/255;
-       }
-       
--      ImlibColor IClr={255,0,255,0};
--      Imlib_set_image_shape(D->Data, Bg, &IClr);
-       Imlib_apply_image( D->Data, Bg, Win );
- 
-       Imlib_kill_image( D->Data, Bg );
-@@ -146,17 +143,33 @@
-     
-     bool locked = D->IsLocked();
- 
--    if( Ev->type == ButtonRelease )
-+    if( D->GetDoubleClick() )
-     {
--      // Something of a special case.
--      if( Ev->xbutton.time - Time <= 200 )
-+      if( Ev->type == ButtonRelease )
-       {
--	D->Execute( Command );
--	Time = 0;
-+        // Something of a special case.  Doubleclick
-+        if( Ev->xbutton.time - Time <= 200 )
-+        {
-+         D->Execute( Command );
-+         Time = 0;
-+        }
-+        else Time = Ev->xbutton.time;
-       }
--      else Time = Ev->xbutton.time;
-     }
--     
-+    else 
-+    { 
-+      // If buttontime is less than 200ms we click, else we drag.  Singleclick
-+      if( Ev->type == ButtonPress )
-+        Time = Ev->xbutton.time;
-+  
-+      if( Ev->type == ButtonRelease && 
-+        Ev->xbutton.time - Time <= 200 )
-+      {
-+        D->Execute( Command );
-+        Time = 0;
-+      }
-+    }
-+
-     if( locked ) return;
- 
-     switch( Ev->type )
-diff -ru idesk-0.3.5/Icon.h idesk-0.3.5-simeng/Icon.h
---- idesk-0.3.5/Icon.h	2002-10-28 22:30:03.000000000 +0100
-+++ idesk-0.3.5-simeng/Icon.h	2003-02-13 21:46:42.000000000 +0100
-@@ -7,7 +7,7 @@
-   class Icon {
-     private:
-        Desk *D;
--       char *Command, *Caption;
-+       char *Command;
-        XGlyphInfo FontInfo;
-        bool FreeAlpha;
-        bool Glowing;
-@@ -18,6 +18,7 @@
- 
-        Window Win, Text;
-        XftDraw *Draw;
-+       char *Caption;
-        char FileName[128];
-        unsigned char *rgb, *alpha, *alpha2;
-        int LoadPng( char *filename );
-diff -ru idesk-0.3.5/README idesk-0.3.5-simeng/README
---- idesk-0.3.5/README	2002-11-09 19:06:16.000000000 +0100
-+++ idesk-0.3.5-simeng/README	2003-02-14 03:05:08.000000000 +0100
-@@ -26,6 +26,7 @@
-   PaddingY: 25
-   Locked: false
-   HighContrast: false
-+  DoubleClick: true
-   Transparency: 150
-   Shadow: true
-   ShadowColor: #000000
-@@ -41,6 +42,9 @@
- it is true.  It will draw it in an arbitary colour if it "#aa00aa", for
- example.  And it will not draw anything at all if it is set to "false".
- 
-+"DoubleClick" when set true it requires you to doubleclick on an icon to 
-+execute programs while only a single click is required when set to false.
-+
- "Shadow" is boolean (true/false). Turning this on will draw a drop shadow 
- of color ShadowColor behind the text. The shadow will be ShadowX pixels right
- and ShadowY pixels down (negative values will work). Both ShadowX and ShadowY
-@@ -62,7 +66,7 @@
- executes the command you assigned it.
- 
- You can double-middle click on any icon to reload the icon files in the
--.idestop directory and the .ideskrc settings.
-+.idesktop directory and the .ideskrc settings.
- 
- After you move your icons around to get them where you want them, you can
- change "Locked" from false to true in the config file.
diff --git a/x11-misc/idesk/idesk-0.7.4.ebuild b/x11-misc/idesk/idesk-0.7.4.ebuild
new file mode 100644
index 000000000000..96720f035f0e
--- /dev/null
+++ b/x11-misc/idesk/idesk-0.7.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/idesk-0.7.4.ebuild,v 1.1 2005/09/25 17:15:10 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="Utility to place icons on the root window"
+HOMEPAGE="http://idesk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~alpha ~hppa"
+IUSE=""
+
+DEPEND=">=media-libs/imlib2-1.1.2.20040912
+	virtual/x11
+	media-libs/freetype
+	>=dev-util/pkgconfig-0.12.0
+	dev-libs/libxml2
+	=dev-libs/glib-2*
+	gnome-extra/libgsf
+	=x11-libs/pango-1*
+	=x11-libs/gtk+-2*
+	media-libs/libart_lgpl
+	x11-libs/startup-notification"
+
+src_compile() {
+	econf --enable-libsn || die "configuration failed"
+	emake || die "compilation failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc README AUTHORS COPYING INSTALL NEWS TODO
+}
+
+pkg_postinst() {
+	einfo "Please refer to ${HOMEPAGE} for info on configuring ${PN}"
+}