version bump to use DAG src rpms since ximian's own source rpms are hidden and i don't want to use their binary rpms. fix homepage and cleanup (#94198)

(Portage version: 2.0.51.22-r1)

9 files changed, 73 insertions, 104 deletions

diff --git a/x11-themes/ximian-artwork/ChangeLog b/x11-themes/ximian-artwork/ChangeLog
index bb7200427724..e3a467311eae 100644
--- a/x11-themes/ximian-artwork/ChangeLog
+++ b/x11-themes/ximian-artwork/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/ximian-artwork
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ChangeLog,v 1.21 2005/04/07 17:20:37 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ChangeLog,v 1.22 2005/06/25 14:01:08 liquidx Exp $
+
+*ximian-artwork-0.2.32.1 (25 Jun 2005)
+
+  25 Jun 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/ximian-artwork-0.2.32.1-disable_industrial_engine.patch,
+  ximian-artwork-0.2.29.0.6.3.ebuild, +ximian-artwork-0.2.32.1.ebuild:
+  version bump to use DAG src rpms since ximian's own source rpms are hidden
+  and i don't want to use their binary rpms. fix homepage and cleanup (#94198)
 
   07 Apr 2005; Simon Stelling <blubb@gentoo.org>
   ximian-artwork-0.2.29.0.6.3.ebuild:
diff --git a/x11-themes/ximian-artwork/Manifest b/x11-themes/ximian-artwork/Manifest
index eb3d856dabef..f8161c8cb6b7 100644
--- a/x11-themes/ximian-artwork/Manifest
+++ b/x11-themes/ximian-artwork/Manifest
@@ -2,10 +2,14 @@ MD5 35c9b54f9b145f1fd9221d1b35823a9a ChangeLog 3084
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 a740c11e46e5ddf7c1e7524a8f538bae ximian-artwork-0.2.26.0.6.1-r1.ebuild 2332
 MD5 84c7f2b72c7ddad74c9d09a0129ce61a ximian-artwork-0.2.29.0.6.2.ebuild 2064
-MD5 42c11dda5a3c0d7973b9beec803602ad ximian-artwork-0.2.29.0.6.3.ebuild 1964
+MD5 e198d9cb12126376c22ee1fa1596183d ximian-artwork-0.2.29.0.6.3.ebuild 1977
+MD5 282bb96a11f6110e0ad83a9e0bfe1f50 ximian-artwork-0.2.32.1.ebuild 1950
 MD5 4c7e2c510200a7fcf63d66700ada089c files/digest-ximian-artwork-0.2.26.0.6.1-r1 88
 MD5 d9e6ded479cfe7c67372ca49a48e7538 files/digest-ximian-artwork-0.2.29.0.6.2 88
 MD5 f3b6233f881db50604d1cceebc2c2b40 files/digest-ximian-artwork-0.2.29.0.6.3 88
 MD5 481c98be012989222f01734d8c6e43e4 files/ximian-artwork-0.2.26-corruption_fix.patch 716
 MD5 a733ce592710282d7d68dceedcf32d00 files/ximian-artwork-0.2.26-gdm.patch 520
 MD5 4f09d13cbbc85be041773d463dd83fc3 files/ximian-artwork-0.2.29-disable_industrial.patch 2313
+MD5 115e6c83c087c365b439c69ea3846845 files/digest-ximian-artwork-0.2.32.0.6.2 89
+MD5 658478d0857190dcb5b10e815bf0c704 files/digest-ximian-artwork-0.2.32.1 80
+MD5 97a527cd1be3926af01ecbff0cc1311d files/ximian-artwork-0.2.32.1-disable_industrial_engine.patch 1374
diff --git a/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.26.0.6.1-r1 b/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.26.0.6.1-r1
deleted file mode 100644
index a1ce210ee463..000000000000
--- a/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.26.0.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 40a4b551cab97860eead3cff519e7278 ximian-artwork-0.2.26-0.ximian.6.1.src.rpm 3818278
diff --git a/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.2 b/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.2
deleted file mode 100644
index ff072802a9c1..000000000000
--- a/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b0fc5b6299d1f6ca5df0769d7816265 ximian-artwork-0.2.29-0.ximian.6.2.src.rpm 3825045
diff --git a/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.32.1 b/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.32.1
new file mode 100644
index 000000000000..8a9435f1a2f4
--- /dev/null
+++ b/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.32.1
@@ -0,0 +1 @@
+MD5 2ead99009e939f8197d47a4785898f20 ximian-artwork-0.2.32-1.rf.src.rpm 3958480
diff --git a/x11-themes/ximian-artwork/files/ximian-artwork-0.2.32.1-disable_industrial_engine.patch b/x11-themes/ximian-artwork/files/ximian-artwork-0.2.32.1-disable_industrial_engine.patch
new file mode 100644
index 000000000000..3d16dc07a911
--- /dev/null
+++ b/x11-themes/ximian-artwork/files/ximian-artwork-0.2.32.1-disable_industrial_engine.patch
@@ -0,0 +1,41 @@
+--- ximian-artwork-0.2.32/configure.ac	2003-08-29 19:02:58.000000000 +0100
++++ ximian-artwork-0.2.32/configure.ac.new	2005-06-25 14:16:51.110708216 +0100
+@@ -19,30 +19,11 @@
+ 
+ AC_PROG_INTLTOOL([0.23])
+ 
+-AM_PATH_GTK(1.2.9, , 
+-        AC_MSG_ERROR([*** GTK+-1.2.9 not installed - please install first ***]))
+-AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,
+-             AC_MSG_ERROR([*** gtk_style_set_prop_experimental() not found; perhaps you have an old CVS version of GTK+ ***]),
+-             $GTK_LIBS)
+-
+-PKG_CHECK_MODULES(XIMART, gtk+-2.0)
+-AC_SUBST(XIMART_CFLAGS)
+-AC_SUBST(XIMART_LIBS)
+-
+-GTK2_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+-AC_SUBST(GTK2_VERSION)
+-
+ AC_CONFIG_FILES([
+ Makefile
+ galeon/Makefile
+ gdm/Makefile
+ gnome-session/Makefile
+-gtk/Makefile
+-gtk/gtk1-engine/Makefile
+-gtk/gtk1-engine/gtk/Makefile
+-gtk/gtk2-engine/Makefile
+-gtk/gtk2-engine/gtk-2.0/Makefile
+-gtk/gtk2-engine/gtk-2.0/gtkrc
+ icons/Makefile
+ icons/Industrial/Makefile
+ icons/Industrial/24x24/Makefile
+--- ximian-artwork-0.2.32/Makefile.am	2003-02-21 19:53:29.000000000 +0000
++++ ximian-artwork-0.2.32/Makefile.am.new	2005-06-25 14:17:31.967099421 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = po gdm gnome-session gtk icons galeon metacity nautilus wallpapers xmms
++SUBDIRS = po gdm gnome-session icons galeon metacity nautilus xmms
+ 
+ THEME_IN_FILES=index.theme.in
+ 
diff --git a/x11-themes/ximian-artwork/ximian-artwork-0.2.26.0.6.1-r1.ebuild b/x11-themes/ximian-artwork/ximian-artwork-0.2.26.0.6.1-r1.ebuild
deleted file mode 100644
index f48a751968e4..000000000000
--- a/x11-themes/ximian-artwork/ximian-artwork-0.2.26.0.6.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.26.0.6.1-r1.ebuild,v 1.10 2005/01/09 19:28:33 joem Exp $
-
-inherit eutils rpm
-
-# bash magic to extract last 2 versions as XIMIAN_V,
-# third last version as RPM_V and the rest as MY_PV
-MY_PV=${PV%.[0-9]*.[0-9]*.[0-9]*}
-END_V=${PV/${MY_PV}./}
-RPM_V=${END_V%.[0-9]*.[0-9]*}
-XIMIAN_V=${END_V#[0-9]*.}
-
-DESCRIPTION="Ximian Desktop's GTK, Galeon, GDM, Metacity, Nautilus, XMMS themes, icons and cursors."
-HOMEPAGE="http://www.ximian.com/xd2/"
-SRC_URI="ftp://ftp.ximian.com/pub/xd2/redhat-9-i386/source/${PN}-${MY_PV}-${RPM_V}.ximian.${XIMIAN_V}.src.rpm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ppc"
-IUSE="xmms"
-
-# until we can do mutliple dep on one package, it'll be >=x11-libs/gtk+-1.2
-# even though we want =x11-libs/gtk+-1.2 and >=x11-libs/gtk+-2
-DEPEND="sys-devel/autoconf
-	sys-devel/automake
-	app-arch/rpm2targz
-	>=media-libs/gdk-pixbuf-0.2.5
-	>=x11-libs/gtk+-1.2"
-
-# Because one may only want to use the theme with kde OR gtk OR Metacity
-# OR gdm, we don't want any run-time dependencies...
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-#src_unpack() {
-#	cd ${WORKDIR}
-#	rpm2targz ${DISTDIR}/${A}
-#	tar xzf ${PN}-${MY_PV}-${RPM_V}.ximian.${XIMIAN_V}.src.tar.gz
-#	tar xzf ${PN}-${MY_PV}.tar.gz
-#}
-
-src_unpack() {
-	rpm_src_unpack
-
-	epatch ${FILESDIR}/${PN}-0.2.26-corruption_fix.patch
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	# Removing trademarks
-	patch ${D}/usr/share/gdm/themes/industrial/industrial.xml < ${FILESDIR}/${PN}-${MY_PV}-gdm.patch || die "patch failed"
-	rm -f ${D}/usr/share/gdm/themes/industrial/xd2logo.png
-	rm -rf ${D}/usr/share/pixmaps/ximian
-	rm -f ${D}/usr/share/pixmaps/ximian-desktop-stripe.png
-
-	# Set up X11 implementation
-	X11_IMPLEM_P="$(best_version virtual/x11)"
-	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-	X11_IMPLEM="${X11_IMPLEM##*\/}"
-	einfo "X11 implementation is ${X11_IMPLEM}."
-
-	# Moving cursors
-	dodir /usr/share/cursors/${X11_IMPLEM}/Industrial
-	mv ${D}/usr/share/icons/Industrial/cursors ${D}/usr/share/cursors/${X11_IMPLEM}/Industrial
-
-	# remove xmms skin if unneeded
-	use xmms || rm -rf ${D}/usr/share/xmms
-
-	cd ${S}
-	dodoc COPYING ChangeLog
-}
-
diff --git a/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.3.ebuild b/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.3.ebuild
index e9445ed2d79b..7359c2e9f680 100644
--- a/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.3.ebuild
+++ b/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.3.ebuild,v 1.12 2005/04/07 17:20:37 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.3.ebuild,v 1.13 2005/06/25 14:01:08 liquidx Exp $
 
 inherit rpm eutils
 
@@ -12,7 +12,7 @@ RPM_V=${END_V%.[0-9]*.[0-9]*}
 XIMIAN_V=${END_V#[0-9]*.}
 
 DESCRIPTION="Ximian Desktop's GTK, Galeon, GDM, Metacity, Nautilus, XMMS themes, icons and cursors."
-HOMEPAGE="http://www.ximian.com/xd2/"
+HOMEPAGE="http://www.novell.com/products/desktop/"
 SRC_URI="ftp://ftp.ximian.com/pub/xd2/redhat-9-i386/source/${PN}-${MY_PV}-${RPM_V}.ximian.${XIMIAN_V}.src.rpm"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.2.ebuild b/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild
index 7960fd90e848..42740a83e44f 100644
--- a/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.2.ebuild
+++ b/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild
@@ -1,42 +1,40 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.29.0.6.2.ebuild,v 1.9 2005/01/09 19:28:33 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild,v 1.1 2005/06/25 14:01:08 liquidx Exp $
 
-inherit eutils rpm
+inherit rpm eutils versionator
 
-# bash magic to extract last 2 versions as XIMIAN_V, 
+# bash magic to extract last 2 versions as XIMIAN_V,
 # third last version as RPM_V and the rest as MY_PV
-MY_PV=${PV%.[0-9]*.[0-9]*.[0-9]*}
-END_V=${PV/${MY_PV}./}
-RPM_V=${END_V%.[0-9]*.[0-9]*}
-XIMIAN_V=${END_V#[0-9]*.}
+MY_PV=$(get_version_component_range 1-3)
+RPM_V=$(get_version_component_range 4)
 
 DESCRIPTION="Ximian Desktop's GTK, Galeon, GDM, Metacity, Nautilus, XMMS themes, icons and cursors."
-HOMEPAGE="http://www.ximian.com/xd2/"
-SRC_URI="ftp://ftp.ximian.com/pub/xd2/redhat-9-i386/source/${PN}-${MY_PV}-${RPM_V}.ximian.${XIMIAN_V}.src.rpm"
+HOMEPAGE="http://www.novell.com/products/desktop/"
+SRC_URI="http://apt.sw.be/packages/ximian-artwork/ximian-artwork-${MY_PV}-${RPM_V}.rf.src.rpm"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc amd64 ppc"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
 IUSE="xmms"
 
 DEPEND="sys-devel/autoconf
 	sys-devel/automake
-	app-arch/rpm2targz
-	>=media-libs/gdk-pixbuf-0.2.5
-	=x11-libs/gtk+-1.2*
-	=x11-libs/gtk+-2*"
+	app-arch/rpm2targz"
 
-RDEPEND=""
+
+RDEPEND=">=x11-themes/gnome-themes-extras-0.5"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_unpack() {
 	rpm_src_unpack
-	einfo "Applying ${PN}-0.2.26-corruption_fix.patch .."
-	cd ${S}; patch -p1 < ${FILESDIR}/${PN}-0.2.26-corruption_fix.patch || die "failed patching"
+	cd ${S}
+	epatch ${FILESDIR}/${P}-disable_industrial_engine.patch
 }
 
 src_compile() {
+	aclocal && autoconf && automake || die
+	libtoolize --copy --force
 	econf || die
 	emake || die
 }
@@ -48,7 +46,6 @@ src_install () {
 	patch ${D}/usr/share/gdm/themes/industrial/industrial.xml < ${FILESDIR}/${PN}-0.2.26-gdm.patch || die "patch failed"
 	rm -f ${D}/usr/share/gdm/themes/industrial/xd2logo.png
 	rm -rf ${D}/usr/share/pixmaps/ximian
-	rm -rf ${D}/usr/share/pixmaps/backgrounds
 	rm -f ${D}/usr/share/pixmaps/ximian-desktop-stripe.png
 
 	# Set up X11 implementation
@@ -67,4 +64,3 @@ src_install () {
 	cd ${S}
 	dodoc COPYING ChangeLog
 }
-