New version and cleanup

16 files changed, 38 insertions, 60 deletions

diff --git a/x11-themes/gtk-engines-geramik/ChangeLog b/x11-themes/gtk-engines-geramik/ChangeLog
index 5f0d853e694a..963e1faeb209 100644
--- a/x11-themes/gtk-engines-geramik/ChangeLog
+++ b/x11-themes/gtk-engines-geramik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gtk-engines-geramik
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/ChangeLog,v 1.8 2003/02/12 09:46:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/ChangeLog,v 1.9 2003/05/02 17:00:44 foser Exp $
+
+*gtk-engines-geramik-0.24 (02 May 2003)
+
+  02 May 2003; foser <foser@gentoo.org> gtk-engines-geramik-0.24* :
+  Version bump (#19312)
 
 *gtk-engines-geramik-0.18 (31 Jan 2003)
 
@@ -23,6 +28,9 @@
   
 *gtk-engines-geramik-0.08 (28 Nov 2002)
 
+  02 May 2003; foser <foser@gentoo.org> gtk-enigenes-geramik-0.08* :
+  Added KEYWORDS (!)
+
   28 Nov 2002; L. Boshell <leonardop@gentoo.org> : New version. Created
   two revisions of this package, since the same tarball provides GTK-1 and
   GTK-2 versions of the engine. Thanks to Jeremy Johnson for his
diff --git a/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.17-r1 b/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.17-r1
deleted file mode 100644
index f797673e91c3..000000000000
--- a/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.17-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4087bd21f04e1c9a9fc432f55509314e 3952-Geramik-0.17.tar.gz 468621
diff --git a/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.17-r2 b/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.17-r2
deleted file mode 100644
index f797673e91c3..000000000000
--- a/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.17-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4087bd21f04e1c9a9fc432f55509314e 3952-Geramik-0.17.tar.gz 468621
diff --git a/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.18-r1 b/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.18-r1
deleted file mode 100644
index 38d007608cb8..000000000000
--- a/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.18-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6dbb9a5d2b21e3a42c65db61f07fb1c 3952-Geramik-0.18.tar.gz 470833
diff --git a/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.18-r2 b/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.18-r2
deleted file mode 100644
index 38d007608cb8..000000000000
--- a/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.18-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6dbb9a5d2b21e3a42c65db61f07fb1c 3952-Geramik-0.18.tar.gz 470833
diff --git a/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.24-r1 b/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.24-r1
new file mode 100644
index 000000000000..a16547fdfe7b
--- /dev/null
+++ b/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.24-r1
@@ -0,0 +1 @@
+MD5 f632116374c07a6f1e566442f6705533 3952-Geramik-0.24.tar.gz 472971
diff --git a/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.24-r2 b/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.24-r2
new file mode 100644
index 000000000000..a16547fdfe7b
--- /dev/null
+++ b/x11-themes/gtk-engines-geramik/files/digest-gtk-engines-geramik-0.24-r2
@@ -0,0 +1 @@
+MD5 f632116374c07a6f1e566442f6705533 3952-Geramik-0.24.tar.gz 472971
diff --git a/x11-themes/gtk-engines-geramik/files/gtk-engines-geramik-0.17-gentoo.diff b/x11-themes/gtk-engines-geramik/files/gtk-engines-geramik-0.17-gentoo.diff
deleted file mode 100644
index eca08cf2c1ce..000000000000
--- a/x11-themes/gtk-engines-geramik/files/gtk-engines-geramik-0.17-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -NurB Geramik-0.17/geramik/gtk-2.0/gtkrc-template Geramik-0.17-patched/geramik/gtk-2.0/gtkrc-template
---- Geramik-0.17/geramik/gtk-2.0/gtkrc-template	2002-12-23 11:56:41.000000000 -0500
-+++ Geramik-0.17-patched/geramik/gtk-2.0/gtkrc-template	2003-01-14 01:09:29.000000000 -0500
-@@ -1,7 +1,5 @@
- # Geramik (Uses QtPixmap engine)
- 
--pixmap_path "DATA_DIR/themes/Geramik/gtk"
--
- style "Settings" {
-     engine "ENGINE" {
-         # x, y, w, h
diff --git a/x11-themes/gtk-engines-geramik/files/gtk-engines-geramik-0.18-gentoo.diff b/x11-themes/gtk-engines-geramik/files/gtk-engines-geramik-0.18-gentoo.diff
deleted file mode 100644
index 8efa1d3e5fb3..000000000000
--- a/x11-themes/gtk-engines-geramik/files/gtk-engines-geramik-0.18-gentoo.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- Geramik-0.18/qtpixmap/common.c	2003-01-31 19:13:13.000000000 +0100
-+++ Geramik-0.18_patched/qtpixmap/common.c	2003-01-31 19:14:18.000000000 +0100
-@@ -316,10 +316,6 @@
- 
-         if (locale && *locale)
-         {
--            // The most general syntax of a locale (not all optional parts recognized by all systems) is
--            // language[_territory][.codeset][@modifier][+special][,[sponsor][_revision]]
--            // To retrieve the codeset, search the first dot. Stop searching when
--            // a '@' or '+' or ',' is encountered.
-             char       *buf = (char*) malloc(strlen(locale)+1);
-             const char *codeset = NULL;
-             const char *cp = locale;
-
diff --git a/x11-themes/gtk-engines-geramik/files/gtk-engines-geramik-0.24-gentoo.diff b/x11-themes/gtk-engines-geramik/files/gtk-engines-geramik-0.24-gentoo.diff
new file mode 100644
index 000000000000..68211f774edd
--- /dev/null
+++ b/x11-themes/gtk-engines-geramik/files/gtk-engines-geramik-0.24-gentoo.diff
@@ -0,0 +1,11 @@
+--- Geramik-0.24/qtpixmap2/qtpixbuf-rc-style.c	2003-03-28 07:13:47.000000000 -0500
++++ ../qtpixbuf-rc-style.c	2003-05-02 11:59:31.000000000 -0400
+@@ -232,7 +232,7 @@
+   pixmap = gtk_rc_find_pixmap_in_path(settings, scanner, scanner->value.v_string);
+   if (pixmap)
+     {
+-      //      printf( "%s\n", pixmap );
++      /*      printf( "%s\n", pixmap ); */
+       qt_theme_pixbuf_set_filename (*qt_theme_pb, pixmap);
+       g_free (pixmap);
+     }
diff --git a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r1.ebuild b/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r1.ebuild
index dfc32ed83de7..1b2c0bd21dde 100644
--- a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r1.ebuild
+++ b/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r1.ebuild,v 1.2 2003/02/13 17:38:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r1.ebuild,v 1.3 2003/05/02 17:00:44 foser Exp $
 
 DESCRIPTION="GTK-1 theme engine to make GTK look like KDE"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=3952"
@@ -9,3 +9,5 @@ SLOT="1"
 inherit gtk-engines
 
 newdepend '>=media-libs/imlib-1.8'
+
+KEYWORDS="x86"
diff --git a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r2.ebuild b/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r2.ebuild
index 3af6f2d4d408..90df8d84c111 100644
--- a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r2.ebuild
+++ b/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r2.ebuild,v 1.2 2003/02/13 17:38:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.08-r2.ebuild,v 1.3 2003/05/02 17:00:44 foser Exp $
 
 DESCRIPTION="GTK-2 theme engine to make GTK look like KDE"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=3952"
@@ -9,3 +9,5 @@ SLOT="2"
 inherit gtk-engines
 
 newdepend media-libs/gdk-pixbuf
+
+KEYWORDS="x86"
diff --git a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.17-r1.ebuild b/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.17-r1.ebuild
deleted file mode 100644
index 2cedda7bf1c4..000000000000
--- a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.17-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.17-r1.ebuild,v 1.2 2003/02/13 17:38:54 vapier Exp $
-
-DESCRIPTION="GTK-1 theme engine to make GTK look like KDE"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=3952"
-SLOT="1"
-
-inherit gtk-engines
-
-KEYWORDS="~x86"
-newdepend '>=media-libs/imlib-1.8'
diff --git a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.17-r2.ebuild b/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.17-r2.ebuild
deleted file mode 100644
index 6fea6794b98c..000000000000
--- a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.17-r2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.17-r2.ebuild,v 1.2 2003/02/13 17:38:59 vapier Exp $
-
-DESCRIPTION="GTK-2 theme engine to make GTK look like KDE"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=3952"
-SLOT="2"
-
-inherit gtk-engines
-
-KEYWORDS="~x86"
-
-newdepend media-libs/gdk-pixbuf
diff --git a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.18-r1.ebuild b/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.24-r1.ebuild
index ca302d6fb8ae..e923491c674b 100644
--- a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.18-r1.ebuild
+++ b/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.18-r1.ebuild,v 1.2 2003/02/13 17:39:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.24-r1.ebuild,v 1.1 2003/05/02 17:00:45 foser Exp $
 
 DESCRIPTION="GTK-1 theme engine to make GTK look like KDE"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=3952"
diff --git a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.18-r2.ebuild b/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.24-r2.ebuild
index 312f6d4be347..9631dd907715 100644
--- a/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.18-r2.ebuild
+++ b/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.24-r2.ebuild
@@ -1,13 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.18-r2.ebuild,v 1.2 2003/02/13 17:39:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-geramik/gtk-engines-geramik-0.24-r2.ebuild,v 1.1 2003/05/02 17:00:45 foser Exp $
 
 DESCRIPTION="GTK-2 theme engine to make GTK look like KDE"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=3952"
 SLOT="2"
 
-inherit gtk-engines
+inherit gtk-engines eutils
 
 KEYWORDS="~x86"
 
 newdepend ">=media-libs/gdk-pixbuf-0.21"
+
+#src_unpack() {
+#	gnome2_src_unpack
+#
+#	cd ${S}
+#	epatch ${FILESDIR}/${P}.patch
+#}