porting to rpm.eclass

7 files changed, 11 insertions, 368 deletions

diff --git a/x11-themes/redhat-artwork/ChangeLog b/x11-themes/redhat-artwork/ChangeLog
index d5dc62f986d3..9b8d02c82af9 100644
--- a/x11-themes/redhat-artwork/ChangeLog
+++ b/x11-themes/redhat-artwork/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for x11-themes/redhat-artwork 
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.19 2003/06/20 12:54:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.20 2003/06/21 14:30:21 liquidx Exp $
 
   20 Jun 2003; Caleb Tennis <caleb@gentoo.org>
   Marking redhat-arthwork-0.73 as stable x86
 
+  21 Jun 2003; Alastair Tse <liquidx@gentoo.org>
+  redhat-artwork-0.63-r1.ebuild, redhat-artwork-0.65.ebuild,
+  redhat-artwork-0.73.ebuild:
+  ported to rpm.eclass
+
   12 May 2003; Alastair Tse <liquidx@gentoo.org>
   redhat-artwork-0.63-r1.ebuild, redhat-artwork-0.65.ebuild,
   redhat-artwork-0.73.ebuild, files/redhat-artwork-0.63-gcc2.patch:
diff --git a/x11-themes/redhat-artwork/Manifest b/x11-themes/redhat-artwork/Manifest
index 847c8422a10c..bd1fc0bbfb87 100644
--- a/x11-themes/redhat-artwork/Manifest
+++ b/x11-themes/redhat-artwork/Manifest
@@ -1,13 +1,9 @@
-MD5 3739854a1a9ee7baa0fdfda467a60089 ChangeLog 3008
+MD5 a2f79731cdfc3f0c6e8ec71ead42ee87 ChangeLog 3265
 MD5 f4093899128311aa92272070e1f9a8b7 redhat-artwork-0.39.ebuild 3787
-MD5 2e325dacbfe3e14226cb9dd7bd052b7b redhat-artwork-0.65.ebuild 4791
-MD5 35da32b76b61e4a7b791908a7bb92336 redhat-artwork-0.73.ebuild 5185
+MD5 2c036dd362a32fad043e833e410acfbe redhat-artwork-0.73.ebuild 5095
 MD5 24c10ad9dfe3e4fbcba29a9ca7858a00 redhat-artwork-0.47.ebuild 4381
-MD5 9d7ace9e8cb2086110f2e7b94d5b5bd9 redhat-artwork-0.63-r1.ebuild 4886
 MD5 2b18f0bfd9c83a7d52127c8cb69ba123 files/digest-redhat-artwork-0.39 75
 MD5 3b65e10c4a020c4a0ea202f4865e686f files/digest-redhat-artwork-0.47 75
-MD5 0fb5c58e76226319a9fca808c9d73048 files/digest-redhat-artwork-0.65 75
 MD5 dd889dbdcebae49dc59d0d60dff259de files/redhat-artwork-0.63-cursors.patch 1071
 MD5 927835d1878c71d197a09b5ec12f145d files/digest-redhat-artwork-0.73 75
-MD5 adbfb020eeaf8fb86507313ec19f0390 files/digest-redhat-artwork-0.63-r1 75
 MD5 9912a3c64a0b848f2ccf2673f2b3093d files/redhat-artwork-0.63-gcc2.patch 483
diff --git a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.63-r1 b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.63-r1
deleted file mode 100644
index c7bcc76f82b7..000000000000
--- a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.63-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70bc71f37dfcd8f7b3adad99f8084300 redhat-artwork-0.63-1.src.rpm 7986319
diff --git a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.65 b/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.65
deleted file mode 100644
index d1a0aaa4de46..000000000000
--- a/x11-themes/redhat-artwork/files/digest-redhat-artwork-0.65
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2fe8be449457f52dfc23c994f19e906c redhat-artwork-0.65-1.src.rpm 8441896
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.63-r1.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.63-r1.ebuild
deleted file mode 100644
index 2bf215f45939..000000000000
--- a/x11-themes/redhat-artwork/redhat-artwork-0.63-r1.ebuild
+++ /dev/null
@@ -1,177 +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/redhat-artwork/redhat-artwork-0.63-r1.ebuild,v 1.3 2003/05/12 09:09:32 liquidx Exp $
-
-inherit eutils
-
-RH_EXTRAVERSION="1"
-
-DESCRIPTION="RedHat's Bluecurve theme for GTK1, GTK2, KDE3, GDM, Metacity and Nautilus"
-HOMEPAGE="http://www.redhat.com"
-SRC_URI="ftp://ftp.redhat.com/pub/redhat/linux/rawhide/SRPMS/SRPMS/${P}-${RH_EXTRAVERSION}.src.rpm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha"
-IUSE="kde gtk"
-
-# Needed to build...
-DEPEND="sys-devel/autoconf
-	sys-devel/automake
-	app-arch/rpm2targz
-	>=x11-libs/gtk+-2.0
-	gtk? (  >=media-libs/gdk-pixbuf-0.2.5
-        	=x11-libs/gtk+-1.2* )
-	kde? (	>=x11-libs/qt-3.0.5
-		>=kde-base/kdebase-3.0.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}/${P}"
-
-# We need to change some RedHat-specific stuff to Gentoo-style...
-_replace() {
-	FROM=$1
-	TO=$2
-
-	for FILE in $(fgrep -r -l "${FROM}" *); do
-		echo -n Changing \"${FROM}\" to \"${TO}\" in ${FILE}...
-		sed "s:${FROM}:${TO}:g" < "${FILE}" > "${FILE}.$$"
-		mv "${FILE}.$$" "${FILE}"
-		echo Done.
-	done
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A}
-	tar xzf ${P}*.src.tar.gz
-	tar xzf ${P}.tar.gz
-    cd ${S}; epatch ${FILESDIR}/redhat-artwork-0.63-cursors.patch || die
-	cd ${S}; epatch ${FILESDIR}/redhat-artwork-0.63-gcc2.patch || die
-}
-
-src_compile() {
-
-	export WANT_AUTOCONF_2_5=1
-    # build fails with UTF-8 in locale
-    export LANG=C
-
-	# disable qt and kde support if kde use keyword is not set
-	# note: qt and kde support seem to be tied together... maybe someone with
-	# autoconf experience can seperate the two
-	use kde || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e	"s|dnl KDE_USE_QT||" \
-		-e "s|KDE_||g" \
-		-e "s|AC_PATH_KDE||" \
-		-e "s|art/kde/Makefile||" \
-		-e "s|art/kde/kwin/Makefile||" \
-		-e "s|art/kde/kwin/Bluecurve/Makefile||" \
-			configure.in.old > configure.in
-
-	mv art/Makefile.am art/Makefile.am.old
-	sed -e 	"s|kde||" \
-		-e	"s|qt||" \
-			art/Makefile.am.old > art/Makefile.am
-
-	mv art/Makefile.in art/Makefile.in.old
-	sed -e  "s|kde||" \
-		-e  "s|qt||" \
-			art/Makefile.in.old > art/Makefile.in
-
-	autoconf
-	automake
-
-	)
-
-	# disable gtk 1.x support if gtk use keyword is not set
-	use gtk || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e  "s|AM_PATH_GTK(1.2.9, ,||" \
-		-e  "s|AC_MSG_ERROR(.*GTK+-1.*||" \
- 		-e  "s|AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,||" \
-		-e  "s|AC_MSG_ERROR(.*gtk_style.*||" \
-		-e  "s|             \$GTK_LIBS)||" \
-		-e  "s|AM_PATH_GDK_PIXBUF||" \
-		-e  "s|art/gtk/Bluecurve1/Makefile||" \
-		-e  "s|art/gtk/Bluecurve1/gtk/Makefile||" \
-	configure.in.old > configure.in
-
-	mv art/gtk/Makefile.am art/gtk/Makefile.am.old
-	sed -e  "s|Bluecurve1||" \
-	art/gtk/Makefile.am.old > art/gtk/Makefile.am
-
-	autoconf
-	automake
-	)
-
-	# paths have to be fixed for kde
-	use kde && (
-
-	# Fix paths...
-	_replace "/usr/lib/qt3"          "${QTDIR}"
-	_replace '${libdir}/qt3'         "${QTDIR}"
-	_replace '$(libdir)/qt3'         "${QTDIR}"
-	_replace "/usr/lib/kwin.la"      "${KDEDIR}/lib/kwin.la"
-	chmod +x configure
-
-	)
-
-	./configure || die
-        emake || die
-}
-
-src_install () {
-
-	# The kde/qt makefiles use $DESTDIR, but the rest of them make us use $prefix.
-	# therefore run make seprately for each.
-	for dir in ${S}/po ${S}/art/{cursor,gdm,gtk,icon,metacity,nautilus,pixmaps,tools,xmms}; do
-	    make -C ${dir} prefix=${D}/usr install || die
-	done
-
-	use kde && (
-		for dir in ${S}/art/{qt,kde}; do
-		    make -C ${dir} DESTDIR=${D} install
-		done
-		
-		# install into /usr only, not into $KDEDIR
-		mv ${D}/${KDEDIR}/lib/kde3 ${D}/usr/lib
-		mv ${D}/${KDEDIR}/share/apps ${D}/share
-		dodir ${QTDIR}
-		mv ${D}/${KDEDIR}/lib/qt-3.1/plugins ${D}/${QTDIR}/
-		mv ${D}/share/* ${D}/usr/share
-		rm -rf ${D}/${KDEDIR}
-	)
-
-	use kde || (
-		rm -rf ${D}/usr/share/apps
-	)
-
-	# yank redhat logos (registered trademarks, etc)
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/screenshot.png
-
-	cd ${D}/usr/share/gdm/themes/Bluecurve/
-
-	# replace redhat logo with gnome logo from happygnome theme
-	sed -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \
-		-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' \
-		Bluecurve.xml > Bluecurve.xml.mod || die
-
-	mv Bluecurve.xml.mod Bluecurve.xml
-
-	# Bluecurve GDM screenshot has redhat logo
-	# Theme copyright notice left intact... do not modify it
-	sed -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop > GdmGreeterTheme.desktop.mod
-	mv GdmGreeterTheme.desktop.mod GdmGreeterTheme.desktop
-
-	cd ${S}
-	dodoc AUTHORS NEWS README ChangeLog
-}
-
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.65.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.65.ebuild
deleted file mode 100644
index 82d1492d9566..000000000000
--- a/x11-themes/redhat-artwork/redhat-artwork-0.65.ebuild
+++ /dev/null
@@ -1,175 +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/redhat-artwork/redhat-artwork-0.65.ebuild,v 1.6 2003/05/12 09:09:32 liquidx Exp $
-
-inherit eutils
-
-RH_EXTRAVERSION="1"
-
-DESCRIPTION="RedHat's Bluecurve theme for GTK1, GTK2, KDE3, GDM, Metacity and Nautilus"
-HOMEPAGE="http://www.redhat.com"
-SRC_URI="ftp://ftp.redhat.com/pub/redhat/linux/beta/phoebe/en/os/i386/SRPMS/${P}-${RH_EXTRAVERSION}.src.rpm"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha"
-IUSE="kde gtk"
-
-# Needed to build...
-DEPEND="sys-devel/autoconf
-	sys-devel/automake
-	app-arch/rpm2targz
-	>=x11-libs/gtk+-2.0
-	gtk? (  >=media-libs/gdk-pixbuf-0.2.5
-        	=x11-libs/gtk+-1.2* )
-	kde? (	>=x11-libs/qt-3.0.5
-		>=kde-base/kdebase-3.0.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}/${P}"
-
-# We need to change some RedHat-specific stuff to Gentoo-style...
-_replace() {
-	FROM=$1
-	TO=$2
-
-	for FILE in $(fgrep -r -l "${FROM}" *); do
-		echo -n Changing \"${FROM}\" to \"${TO}\" in ${FILE}...
-		sed "s:${FROM}:${TO}:g" < "${FILE}" > "${FILE}.$$"
-		mv "${FILE}.$$" "${FILE}"
-		echo Done.
-	done
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A}
-	tar xzf ${P}*.src.tar.gz
-	tar xzf ${P}.tar.gz
-    cd ${S}
-    epatch ${FILESDIR}/redhat-artwork-0.63-cursors.patch || die
-	epatch ${FILESDIR}/redhat-artwork-0.63-gcc2.patch || die
-}
-
-src_compile() {
-
-	export WANT_AUTOCONF_2_5=1
-    # dies is LANG has UTF-8
-    export LANG=C 
-
-	use kde || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e	"s|dnl KDE_USE_QT||" \
-		-e "s|KDE_||g" \
-		-e "s|AC_PATH_KDE||" \
-		-e "s|art/kde/Makefile||" \
-		-e "s|art/kde/kwin/Makefile||" \
-		-e "s|art/kde/kwin/Bluecurve/Makefile||" \
-			configure.in.old > configure.in
-
-	mv art/Makefile.am art/Makefile.am.old
-	sed -e 	"s|kde||" \
-		-e	"s|qt||" \
-			art/Makefile.am.old > art/Makefile.am
-
-	mv art/Makefile.in art/Makefile.in.old
-	sed -e  "s|kde||" \
-		-e  "s|qt||" \
-			art/Makefile.in.old > art/Makefile.in
-
-	autoconf
-	automake
-
-	)
-
-	# disable gtk 1.x support if gtk use keyword is not set
-	use gtk || (
-
-	rm configure
-	mv configure.in configure.in.old
-	sed -e  "s|AM_PATH_GTK(1.2.9, ,||" \
-		-e  "s|AC_MSG_ERROR(.*GTK+-1.*||" \
- 		-e  "s|AC_CHECK_LIB(gtk, gtk_style_set_prop_experimental, :,||" \
-		-e  "s|AC_MSG_ERROR(.*gtk_style.*||" \
-		-e  "s|             \$GTK_LIBS)||" \
-		-e  "s|AM_PATH_GDK_PIXBUF||" \
-		-e  "s|art/gtk/Bluecurve1/Makefile||" \
-		-e  "s|art/gtk/Bluecurve1/gtk/Makefile||" \
-	configure.in.old > configure.in
-
-	mv art/gtk/Makefile.am art/gtk/Makefile.am.old
-	sed -e  "s|Bluecurve1||" \
-	art/gtk/Makefile.am.old > art/gtk/Makefile.am
-
-	autoconf
-	automake
-	)
-
-	# paths have to be fixed for kde
-	use kde && (
-
-	# Fix paths...
-	_replace "/usr/lib/qt3"          "${QTDIR}"
-	_replace '${libdir}/qt3'         "${QTDIR}"
-	_replace '$(libdir)/qt3'         "${QTDIR}"
-	_replace "/usr/lib/kde3"         "${KDEDIR}/lib"
-	_replace '${libdir}/kde3'        "${KDEDIR}/lib"
-	_replace "/usr/lib/kwin.la"      "${KDEDIR}/lib/kwin.la"
-	chmod +x configure
-
-	)
-
-	# fix iconrc
-	mv art/gtk/make-iconrc.sh art/gtk/make-iconrc.sh.broken
-	sed 's|ICON_PATH=$3|ICON_PATH=/usr/share/icons/Bluecurve/24x24/stock|' \
-		art/gtk/make-iconrc.sh.broken >  art/gtk/make-iconrc.sh
-	chmod +x art/gtk/make-iconrc.sh
-
-	./configure || die
-        emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr kde_moduledir=${D}/${KDEDIR}/lib \
-	styledir=${D}/${KDEDIR}/lib/kde3/plugins/styles \
-	settingsdir=${D}/${KDEDIR}/etc/settings install || die
-
-	use kde && (
-		dodir ${KDEDIR}/share/apps
-		mv ${D}/usr/share/apps/* ${D}/${KDEDIR}/share/apps
-		rmdir ${D}/usr/share/apps
-
-		dodir ${KDEDIR}/share/icons
-		dosym /usr/share/icons/Bluecurve ${KDEDIR}/share/icons/Bluecurve
-	)
-
-	use kde || (
-		rm -rf ${D}/usr/share/apps
-	)
-
-	# yank redhat logos (registered trademarks, etc)
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png
-	rm -f ${D}/usr/share/gdm/themes/Bluecurve/screenshot.png
-
-	cd ${D}/usr/share/gdm/themes/Bluecurve/
-
-	# replace redhat logo with gnome logo from happygnome theme
-	sed -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.png"/>|' \
-		-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' \
-		Bluecurve.xml > Bluecurve.xml.mod || die
-
-	mv Bluecurve.xml.mod Bluecurve.xml
-
-	# Bluecurve GDM screenshot has redhat logo
-	# Theme copyright notice left intact... do not modify it
-	sed -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop > GdmGreeterTheme.desktop.mod
-	mv GdmGreeterTheme.desktop.mod GdmGreeterTheme.desktop
-
-	cd ${S}
-	dodoc AUTHORS NEWS README ChangeLog
-}
-
diff --git a/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild b/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild
index 803fd33effe4..050d03d62e80 100644
--- a/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild,v 1.4 2003/06/20 12:54:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-0.73.ebuild,v 1.5 2003/06/21 14:30:21 liquidx Exp $
 
-inherit eutils
+inherit eutils rpm
 
 RH_EXTRAVERSION="1"
 
@@ -17,7 +17,6 @@ IUSE="kde gtk xmms gtk2"
 # Needed to build...
 DEPEND="sys-devel/autoconf
 	sys-devel/automake
-	app-arch/rpm2targz
 	>=x11-libs/gtk+-2.0
 	gtk? (  >=media-libs/gdk-pixbuf-0.2.5
         	=x11-libs/gtk+-1.2* )
@@ -45,10 +44,7 @@ _replace() {
 }
 
 src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A}
-	tar xzf ${P}*.src.tar.gz
-	tar xzf ${P}.tar.gz
+	rpm_src_unpack
     cd ${S}
     epatch ${FILESDIR}/redhat-artwork-0.63-cursors.patch || die
 	epatch ${FILESDIR}/redhat-artwork-0.63-gcc2.patch || die