Cleanup autotools handling, and use unpack for applying patches and preparing, so that the package will build properly when using libtool 2.4 and a modern automake.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

3 files changed, 45 insertions, 31 deletions

diff --git a/x11-themes/redhat-artwork/ChangeLog b/x11-themes/redhat-artwork/ChangeLog
index 9dce982eb909..5aedd90505b9 100644
--- a/x11-themes/redhat-artwork/ChangeLog
+++ b/x11-themes/redhat-artwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/redhat-artwork
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.100 2009/11/07 13:29:58 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.101 2010/12/01 23:37:00 flameeyes Exp $
+
+  01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  redhat-artwork-5.0.8-r4.ebuild:
+  Cleanup autotools handling, and use unpack for applying patches and
+  preparing, so that the package will build properly when using libtool 2.4 and
+  a modern automake.
 
   07 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
   redhat-artwork-5.0.8-r4.ebuild:
diff --git a/x11-themes/redhat-artwork/Manifest b/x11-themes/redhat-artwork/Manifest
index bc8a2c9fe390..f5fefe2fb3c4 100644
--- a/x11-themes/redhat-artwork/Manifest
+++ b/x11-themes/redhat-artwork/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST redhat-artwork-5.0.8-4.fc7.src.rpm 8298864 RMD160 16fb661589d91fd29bddcc1598ad21cda2166af7 SHA1 1bbeb56d2eb13825bd3ccaad26e82818c584aedd SHA256 ca4372b0174999d249400150365c48bcc2e2f8cd8564ce7b5cf8d8bab1dae268
-EBUILD redhat-artwork-5.0.8-r4.ebuild 4823 RMD160 c1c9e86fbb7258686adfe69236091bde40e5608c SHA1 4169161017719d18d8d7404803ffa1417d7d0a61 SHA256 97bbf6f08e1b1a8fb08ebbe03293ffcf52afbdc09a304d80f4e36d7aa4aa571f
-MISC ChangeLog 13845 RMD160 0a12d15318dba5c52562594fd93f98d7ddeaa8ff SHA1 77d35686c553906f7148732640ce786991c3c2dc SHA256 bf2092df105bd4d9a6416eef22fc0664dda8e40487a5e14eeada8ff72fd89173
+EBUILD redhat-artwork-5.0.8-r4.ebuild 4684 RMD160 c664155db9e3f6754704c185bc2b9411213abd69 SHA1 4d15a2037a1bd19fc22c1d99cdc75687789e18e8 SHA256 fe20c2e55460bd92c624205a1068b656456d1821776c7f73208ad4757075454d
+MISC ChangeLog 14107 RMD160 be737d6689f2b8161593e6f5efcdbcdcd2f7b69a SHA1 195596b042039649aed5fd06e952a2c0eb13ab4b SHA256 b6fb705bee840323062264d828e1a7e275074ff48996d7b95d03c105b216fdb4
 MISC metadata.xml 750 RMD160 0b9bc1a94ab84dc7e6601b406561e0a3e0693490 SHA1 8b28d0411d97085f12ea30b43a2e0698f1c6b85a SHA256 f193cda3c954cc6e77c7a0291f252d5bae7f4f2370f1b51fc83259f9f7e13ccc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz23BwACgkQAiZjviIA2XjaygCghjLKo8+WuE4cuHGb1wCKGqtX
+5lAAoOnjZJy3Rz5AGEINW1GKGI/rdcuA
+=jASA
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild b/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild
index fc28d1d25c4f..e2a372df3e04 100644
--- a/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild,v 1.9 2009/11/07 13:29:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild,v 1.10 2010/12/01 23:37:00 flameeyes Exp $
 
 inherit eutils rpm autotools
 
@@ -21,14 +21,14 @@ RDEPEND=">=x11-libs/gtk+-2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
-	media-gfx/icon-slicer
-	=sys-devel/automake-1.8*"
+	media-gfx/icon-slicer"
 
 RESTRICT="test"
 
-src_compile() {
-
+src_unpack() {
+	rpm_src_unpack
 	cd "${S}"
+
 	epatch "${WORKDIR}/redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch"
 	epatch "${WORKDIR}/redhat-artwork-5.0.8-echo.patch"
 
@@ -36,35 +36,32 @@ src_compile() {
 	export LANG=C
 	export LC_ALL=C
 
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.8
-
 	rm -f configure
 	sed -i -e "s|.*MCOPIDL.*||" \
-	       -e "s|.*ARTSCCONFIG.*||" \
+		   -e "s|.*ARTSCCONFIG.*||" \
 		acinclude.m4
 
 	sed -i -e "s|KDE_SET_PREFIX||" \
-	       -e "s|KDE_CHECK_FINAL||" \
-	       -e "s|dnl KDE_USE_QT||" \
-	       -e "s|AC_PATH_KDE||" \
-	       -e "s|art/kde/Makefile||" \
-	       -e "s|art/kde/kwin/Makefile||" \
-	       -e "s|art/kde/kwin/Bluecurve/Makefile||" \
+		   -e "s|KDE_CHECK_FINAL||" \
+		   -e "s|dnl KDE_USE_QT||" \
+		   -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
 
 	sed -i -e "s|kde||" \
-	       -e "s|qt||" \
+		   -e "s|qt||" \
 			art/Makefile.am
 
 	sed -i -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||" \
+		   -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
 
 	sed -i -e "s|Bluecurve1||" \
@@ -78,17 +75,18 @@ src_compile() {
 		art/icon/Makefile.am \
 		art/icon/Bluecurve/sheets/Makefile.am || die
 
-	eautoreconf --force --install || die "autoreconf failed"
+	eautoreconf
 
 	ebegin "Running intltoolize"
 	intltoolize --force || die "intltoolize failed"
 	eend $?
 
 	sed -i -e "s|GtkStyle|4|" art/qt/Bluecurve/bluecurve.cpp || die
+}
 
+src_compile() {
 	econf || die
 	emake QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles" || die
-
 }
 
 src_install () {
@@ -98,7 +96,7 @@ src_install () {
 	export LC_ALL=C
 
 	make QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles" \
-	     DESTDIR="${D}" install || die
+		 DESTDIR="${D}" install || die
 
 	# yank redhat logos (registered trademarks, etc)
 	rm -f "${D}/usr/share/gdm/themes/Bluecurve/rh_logo-header.png"