Bump to 1.0, fix for GTK+ 2.4

5 files changed, 117 insertions, 7 deletions

diff --git a/x11-themes/mandrake-artwork/ChangeLog b/x11-themes/mandrake-artwork/ChangeLog
index ea8aa248f58f..3d00f17aa6bd 100644
--- a/x11-themes/mandrake-artwork/ChangeLog
+++ b/x11-themes/mandrake-artwork/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/mandrake-artwork
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/mandrake-artwork/ChangeLog,v 1.10 2004/02/29 16:45:27 aliz Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mandrake-artwork/ChangeLog,v 1.11 2004/03/20 06:52:29 brad Exp $
+
+*mandrake-artwork-1.0.0 (20 Mar 2004)
+
+  20 Mar 2004; Brad Laue <brad@gentoo.org> mandrake-artwork-1.0.0.ebuild,
+  files/galaxy-gtk24.patch:
+  Update to Galaxy theme version 1.0. Still not sure on the KDE thing. Report
+  bugs.
 
   18 Nov 2003; Brad Laue <brad@gentoo.org> mandrake-artwork-0.9.6.ebuild:
   Mask 0.9.6, doesn't like KDE yet
diff --git a/x11-themes/mandrake-artwork/Manifest b/x11-themes/mandrake-artwork/Manifest
index f4efa21b01c6..2f1b9b637d23 100644
--- a/x11-themes/mandrake-artwork/Manifest
+++ b/x11-themes/mandrake-artwork/Manifest
@@ -1,12 +1,14 @@
-MD5 b429efd72736e2733e85a6e45af6d6b6 mandrake-artwork-0.9.ebuild 1489
-MD5 134097d29f66ce28cb03b043544734c2 mandrake-artwork-0.9.6.ebuild 1630
+MD5 888126e3ce3b64f9f843c3ada943b8b4 mandrake-artwork-0.9.1-r1.ebuild 1453
 MD5 46bf507e441ac9e972536941a56bca41 mandrake-artwork-0.9.1.ebuild 1492
+MD5 b429efd72736e2733e85a6e45af6d6b6 mandrake-artwork-0.9.ebuild 1489
 MD5 6dabdb7f0e196d9ff32c36e777c913b3 mandrake-artwork-0.9.3.ebuild 1631
-MD5 888126e3ce3b64f9f843c3ada943b8b4 mandrake-artwork-0.9.1-r1.ebuild 1453
-MD5 ee996a5288ed550fd51ad8995b19a418 ChangeLog 1570
 MD5 5d0c50012374761745d511ea0ff0fbb5 metadata.xml 195
-MD5 3edca42eb97517ded61d3787226a8549 files/digest-mandrake-artwork-0.9.1-r1 70
+MD5 ee996a5288ed550fd51ad8995b19a418 ChangeLog 1570
+MD5 134097d29f66ce28cb03b043544734c2 mandrake-artwork-0.9.6.ebuild 1630
+MD5 a3d92d7251a3016bfa287c171466ba09 mandrake-artwork-1.0.0.ebuild 1729
 MD5 b18cc6e5e061838593678d520fdbd489 files/digest-mandrake-artwork-0.9 68
 MD5 3edca42eb97517ded61d3787226a8549 files/digest-mandrake-artwork-0.9.1 70
+MD5 3edca42eb97517ded61d3787226a8549 files/digest-mandrake-artwork-0.9.1-r1 70
 MD5 2f96c2ed82e3d4380e2678d931dc9238 files/digest-mandrake-artwork-0.9.3 70
 MD5 18491a6a8d22c319b0dd7016ab0264ca files/digest-mandrake-artwork-0.9.6 70
+MD5 6bea26362a0cd43a50c9ae190a787468 files/digest-mandrake-artwork-1.0.0 70
diff --git a/x11-themes/mandrake-artwork/files/digest-mandrake-artwork-1.0.0 b/x11-themes/mandrake-artwork/files/digest-mandrake-artwork-1.0.0
new file mode 100644
index 000000000000..1c9f8f7a84df
--- /dev/null
+++ b/x11-themes/mandrake-artwork/files/digest-mandrake-artwork-1.0.0
@@ -0,0 +1 @@
+MD5 f6beb5bc2cc2c45e010cff79c775f835 galaxy-1.0.0-3mdk.src.rpm 348309
diff --git a/x11-themes/mandrake-artwork/files/galaxy-gtk24.patch b/x11-themes/mandrake-artwork/files/galaxy-gtk24.patch
new file mode 100644
index 000000000000..15ab9cc46ca2
--- /dev/null
+++ b/x11-themes/mandrake-artwork/files/galaxy-gtk24.patch
@@ -0,0 +1,38 @@
+--- gtk-2.0/galaxy_theme_draw.c	2004-01-23 10:47:07.000000000 -0500
++++ gtk-2.0/galaxy_theme_draw.c.orig	2004-03-20 01:44:28.430956120 -0500
+@@ -740,7 +740,7 @@
+     }
+ 
+     if (is_combo_button = (DETAIL("button") && 
+-			   GTK_IS_COMBO(gtk_widget_get_parent(widget)))) {
++			   GTK_IS_COMBO_BOX(gtk_widget_get_parent(widget)))) {
+       xthick = ythick = 1;
+     }
+ 
+@@ -1048,7 +1048,7 @@
+     }
+ 
+     if (shadow_type == GTK_SHADOW_IN && 
+-	widget && (GTK_IS_SPIN_BUTTON (widget) || (GTK_IS_COMBO (gtk_widget_get_parent (widget)))) &&
++	widget && (GTK_IS_SPIN_BUTTON (widget) || (GTK_IS_COMBO_BOX (gtk_widget_get_parent (widget)))) &&
+ 	 DETAIL ("entry"))
+     {
+       GdkGC * gc1 = style->base_gc[GTK_WIDGET_STATE(widget)];
+@@ -1323,7 +1323,7 @@
+ 	gdk_gc_set_clip_rectangle (galaxy_style->gray_gc[2], area);
+       }
+ 
+-      if (("button") && GTK_IS_COMBO(gtk_widget_get_parent(widget))) {
++      if (("button") && GTK_IS_COMBO_BOX(gtk_widget_get_parent(widget))) {
+ 	xthick = ythick = 1;
+       }
+ 
+@@ -2675,7 +2675,7 @@
+     y += 1;
+   }
+   
+-  if (GTK_IS_COMBO(gtk_widget_get_parent(gtk_widget_get_parent(widget)))) {
++  if (GTK_IS_COMBO_BOX(gtk_widget_get_parent(gtk_widget_get_parent(widget)))) {
+     /* same design as KDE arrow, add a line */
+     if (area) {
+       gdk_gc_set_clip_rectangle (style->fg_gc[state], area);
diff --git a/x11-themes/mandrake-artwork/mandrake-artwork-1.0.0.ebuild b/x11-themes/mandrake-artwork/mandrake-artwork-1.0.0.ebuild
new file mode 100644
index 000000000000..5660a6b30b26
--- /dev/null
+++ b/x11-themes/mandrake-artwork/mandrake-artwork-1.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mandrake-artwork/mandrake-artwork-1.0.0.ebuild,v 1.1 2004/03/20 06:52:29 brad Exp $
+
+inherit eutils kde-functions kde
+
+MDK_EXTRAVERSION="3mdk"
+
+DESCRIPTION="Mandrake's Galaxy theme for GTK1, GTK2, Metacity and KDE"
+HOMEPAGE="http://www.mandrakelinux.com"
+SRC_URI="mirror://gentoo/galaxy-${PV}-${MDK_EXTRAVERSION}.src.rpm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha"
+IUSE="kde"
+
+# Needed to build...
+DEPEND="app-arch/rpm2targz
+	>=x11-libs/gtk+-2.0
+	>=media-libs/gdk-pixbuf-0.2.5
+	=x11-libs/gtk+-1.2*
+	kde? ( >=kde-base/kdebase-3.1* )"
+
+src_unpack() {
+	rpm2targz ${DISTDIR}/${A}
+	tar xz --no-same-owner -f galaxy-${PV}-${MDK_EXTRAVERSION}.src.tar.gz
+	tar xj --no-same-owner -f galaxy-${PV}.tar.bz2
+}
+
+src_compile() {
+	cd ${WORKDIR}/galaxy-${PV}
+	#make distclean
+
+	epatch ${FILESDIR}/galaxy-gtk24.patch
+
+	if use kde; then
+		KDE_PLACE_TO_INSTALL=$(echo $KDEDIR | cut -d/ -f4)
+		mv thememdk/mandrake_client/Makefile.in thememdk/mandrake_client/Makefile.in.orig
+		cat thememdk/mandrake_client/Makefile.in.orig | sed s:\$\{libdir\}\/kwin.la:/usr/kde/$KDE_PLACE_TO_INSTALL/lib/kwin.la:g > thememdk/mandrake_client/Makefile.in
+		rm thememdk/mandrake_client/Makefile.in.orig
+		econf --with-qt-dir=/usr/qt/3
+	else
+		sed -si s/KDE_CHECK_FINAL// configure.in
+		sed -si s/AC_PATH_KDE// configure.in
+		autoconf
+		sed -si s/thememdk// Makefile.am
+		sed -si s/thememdk// Makefile.in
+		automake
+		sed -si s/thememdk// Makefile.am
+		sed -si s/thememdk// Makefile.in
+		automake
+	fi
+	econf || die
+	emake || die
+}
+
+src_install () {
+	cd ${WORKDIR}/galaxy-${PV}
+	einstall || die
+	dodoc AUTHORS COPYING README ChangeLog
+}