Fix whitespace. sed must die(). Replace rm -rf with rm -r || die. Remove pointless pkg_postinst() (bug #515424). Fix quoting in sed scripts. Combine sed scripts that touch the same files. I could go on.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 83 insertions, 106 deletions

diff --git a/x11-themes/redhat-artwork/ChangeLog b/x11-themes/redhat-artwork/ChangeLog
index 17ef52907208..a044fd38b774 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.105 2013/12/26 18:51:41 creffett Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/ChangeLog,v 1.106 2014/07/01 23:16:57 jer Exp $
+
+  01 Jul 2014; Jeroen Roovers <jer@gentoo.org> redhat-artwork-5.0.8-r4.ebuild,
+  metadata.xml:
+  Fix whitespace. sed must die(). Replace rm -rf with rm -r || die. Remove
+  pointless pkg_postinst() (bug #515424). Fix quoting in sed scripts. Combine
+  sed scripts that touch the same files. I could go on.
 
   26 Dec 2013; Chris Reffett <creffett@gentoo.org>
   redhat-artwork-5.0.8-r4.ebuild:
diff --git a/x11-themes/redhat-artwork/Manifest b/x11-themes/redhat-artwork/Manifest
index ec34d4e5a159..64ce1fa73411 100644
--- a/x11-themes/redhat-artwork/Manifest
+++ b/x11-themes/redhat-artwork/Manifest
@@ -2,15 +2,13 @@
 Hash: SHA256
 
 DIST redhat-artwork-5.0.8-4.fc7.src.rpm 8298864 SHA256 ca4372b0174999d249400150365c48bcc2e2f8cd8564ce7b5cf8d8bab1dae268 SHA512 e063a281fd561708e560d91b9eb276b0caa80dd6060513240a0a31b6089f3c97fb9959091d719dd6e84b47838408c991a9645be9fc081709027de4d2f2c95a51 WHIRLPOOL 080a47c1091bd98ff09c4b37069905d177c5d391c2f73d298c330b16e53b75232ecba88ae089ed7c5e54b2e85862de796b5259e3cadb50dfde61b8f0fe171db3
-EBUILD redhat-artwork-5.0.8-r4.ebuild 4615 SHA256 6be33519d346f3dff1f899dcca177272ac511e3f7f6ebc6da6756e8934227119 SHA512 64694052c21e10028ec820b952d095272027bee0882130cece8ab5cad09ecd810937bf51c5c48bba71ffbe9086b8cbd175b1c21bafc38fbf8ea3955e9e2063b0 WHIRLPOOL c24e641ce2d80f19f0d22684dd17aba4639b52d7b5318ca8406015d55de71606aeef6e9c2c870031e7c7d118a25c01a33f08e920c69cc31e23a661766d61bfc1
-MISC ChangeLog 14700 SHA256 61d12f73a2eac235ae9a0e04cfde0aa97759970bae436c2121d7206b476cbbd2 SHA512 b03deec320484eddfc51271be3863b51ca1ee17350c656b36b3c1144d59c8e7b71a64201f0a624aeeb277709b0c2b9f3774f221f10961e91d31076f58b786ec6 WHIRLPOOL a33d92b170e2f1d87d7826614c21bc82fad15a79108eaa49512b0a2525849a98201dd29b2c93e8f71a3b76c7e61fc767ca6e413389e04618e832bd8005de15d0
-MISC metadata.xml 750 SHA256 f193cda3c954cc6e77c7a0291f252d5bae7f4f2370f1b51fc83259f9f7e13ccc SHA512 273568c1fe207967dac955f70aec490673661fb78ef1f46de80ab41910e6453eefb148e0855fe69ae1f80acaedca86d5197ee4e6a902fb82e9689fa367e6bcad WHIRLPOOL e1e761bb514c50986a0ae663993fa49fca6a96f129e529e6156483fd99b54eba63debf540930e6721390bdf8909814d95a48a02f2b76a87489b030b1a31997fb
+EBUILD redhat-artwork-5.0.8-r4.ebuild 4037 SHA256 6c642df1eb714bc13c333fe23dfc430c489e6be2ff2e5137ad5460599d433eab SHA512 31340201dd6fc23f0b0b08a7b378b12ca9781a2ebdc66453b6dc3d15810ce3c7e70d1c454d4f3aabe20b0d3145e6873725e23f6b7cc6ebc5a003503a3c31c0e4 WHIRLPOOL 7f7b03b2c770ea7155c1555e8be3c6b31309b15bea222a34bdfa6050b6331e506f48e140f7eefce9bf5ccddccae458a83b7bbe99e7b6afe99e9ebbe8db90bfd1
+MISC ChangeLog 15000 SHA256 bd375adf4833094fe042d7cfc46c8d176978866159009078404ad741da6a9088 SHA512 e04d2152286b3926d4aac6050d1ce66873d2ff254cbde175b90ec9727bedc25e0b16804f7781256cf4cfe8ca1335c2572fdaff158c9a08e3faf0ab21908e98fe WHIRLPOOL a34247216a4200da3a062d1fe2474f41307201d819f7cc7dd9ceae332f54137c3ba3f0305ad4874322426ca0672c8ca027b10f0a12a2f51b829eb186246720fd
+MISC metadata.xml 589 SHA256 a9c1afc9bc420f8e396b1a1346aa50d0c0d26d0be0d838fe2d811253563f8c76 SHA512 a9c56e6a0855e7c50b3278dbc75f023389d2c1587487d2abb7068f0a6f14554e3a84b8ef6ddd39615e3549fddf9eeb96847d2e28c91023a50089688dd39a4ae7 WHIRLPOOL 1b6da5dad19bbad3ac70fef419aa815ee26c5ddcc014d733069e137b4d4f9520e6506319c72c777dedbee59a73b4dcc407459ba2345346edc3ea7aad93e2560e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iKYEAREIAGYFAlK8eslfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1SUSACeJZ9DKZvshgD+XFuRujc+28SG
-jzAAoJhxlk8LmQxoxIjguAN20nhjP8Yg
-=+2EK
+iEYEAREIAAYFAlOzQWsACgkQVWmRsqeSphPmVwCePCdJQptlg3V057VrBE7Yp3QQ
+qS0An2Dgl2Nb8EkmgfMZuObOiZeaxZb/
+=ZpNC
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/redhat-artwork/metadata.xml b/x11-themes/redhat-artwork/metadata.xml
index 17cf3a346ddc..f7a016802280 100644
--- a/x11-themes/redhat-artwork/metadata.xml
+++ b/x11-themes/redhat-artwork/metadata.xml
@@ -2,19 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>desktop-misc</herd>
-<!--
-he doesn't seem to be actively maintaining it, so smithj removed him as
-maintainer:
-
-<maintainer><email>liquidx@gentoo.org</email></maintainer>
--->
 <use>
-	<flag name='audacious'>Install <pkg>media-sound/audacious</pkg> theme</flag>
-	<flag name='cursors'>Install Bluecurve cursors</flag>
-	<flag name='gdm'>Install Bluecurve <pkg>gnome-base/gdm</pkg> theme</flag>
-	<flag name='icons'>Install Bluecurve icons</flag>
-	<flag name='kdm'>Install Bluecurve <pkg>kde-base/kdm</pkg> theme</flag>
-	<flag name='nautilus'>Install Bluecurve <pkg>gnome-base/nautilus</pkg>
-		icons</flag>
+<flag name='audacious'>Install <pkg>media-sound/audacious</pkg> theme</flag>
+<flag name='cursors'>Install Bluecurve cursors</flag>
+<flag name='gdm'>Install Bluecurve <pkg>gnome-base/gdm</pkg> theme</flag>
+<flag name='icons'>Install Bluecurve icons</flag>
+<flag name='kdm'>Install Bluecurve <pkg>kde-base/kdm</pkg> theme</flag>
+<flag name='nautilus'>Install Bluecurve <pkg>gnome-base/nautilus</pkg> icons</flag>
 </use>
 </pkgmetadata>
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 7399dd48a5bf..e0d654d3e401 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,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.14 2013/12/26 18:51:41 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild,v 1.15 2014/07/01 23:16:57 jer Exp $
 
 EAPI=5
-inherit eutils rpm autotools
+inherit autotools eutils rpm
 
 MY_R=${PR/r/}
 DESCRIPTION="RedHat's Bluecurve theme for GTK2, KDE, GDM, Metacity and Nautilus"
@@ -13,16 +13,15 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
-IUSE="audacious"
-
-# See end of src_install():
-IUSE="${IUSE} gdm kdm cursors icons nautilus"
+IUSE="audacious cursors gdm icons kdm nautilus"
 
 RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="
+	${RDEPEND}
 	dev-util/intltool
-	media-gfx/icon-slicer"
+	media-gfx/icon-slicer
+	virtual/pkgconfig
+"
 
 RESTRICT="test"
 
@@ -31,45 +30,36 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${WORKDIR}/redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch"
-	epatch "${WORKDIR}/redhat-artwork-5.0.8-echo.patch"
+	epatch "${WORKDIR}"/redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch
+	epatch "${WORKDIR}"/redhat-artwork-5.0.8-echo.patch
 
 	# dies if LANG has UTF-8
 	export LANG=C
 	export LC_ALL=C
 
 	rm -f configure
-	sed -i -e "s|.*MCOPIDL.*||" \
-		   -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||" \
-			configure.in
-
-	sed -i -e "s|kde||" \
-		   -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||" \
-		configure.in
-
-	sed -i -e "s|Bluecurve1||" \
-		art/gtk/Makefile.am
-
-	sed -i -e 's| $(datadir)| $(DESTDIR)$(datadir)|' \
+	sed -i \
+		-e 's|.*MCOPIDL.*||' \
+		-e 's|.*ARTSCCONFIG.*||' \
+		acinclude.m4 || die
+
+	sed -i \
+		-e 's|AC_PATH_KDE||' \
+		-e 's|KDE_CHECK_FINAL||' \
+		-e 's|KDE_SET_PREFIX||' \
+		-e 's|art/kde/Makefile||' \
+		-e 's|art/kde/kwin/Bluecurve/Makefile||' \
+		-e 's|art/kde/kwin/Makefile||' \
+		-e 's|dnl KDE_USE_QT||' \
+		configure.in || die
+
+	sed -i \
+		-e 's|kde||' \
+		-e 's|qt||' \
+		art/Makefile.am || die
+
+	sed -i \
+		-e 's| $(datadir)| $(DESTDIR)$(datadir)|' \
 		art/cursor/Bluecurve/Makefile.am \
 		art/cursor/Bluecurve-inverse/Makefile.am \
 		art/cursor/LBluecurve/Makefile.am \
@@ -79,58 +69,62 @@ src_prepare() {
 
 	eautoreconf
 
-	ebegin "Running intltoolize"
-	intltoolize --force || die "intltoolize failed"
-	eend $?
+	intltoolize --force || die
 
-	sed -i -e "s|GtkStyle|4|" art/qt/Bluecurve/bluecurve.cpp || die
+	sed -i -e 's|GtkStyle|4|' art/qt/Bluecurve/bluecurve.cpp || die
 }
 
 src_compile() {
-	emake QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles" || die
+	emake QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles"
 }
 
 src_install () {
-
 	# dies if LANG has UTF-8
 	export LANG=C
 	export LC_ALL=C
 
-	make QTDIR="${QTDIR}" styledir="${QTDIR}/plugins/styles" \
-		 DESTDIR="${D}" install || die
+	emake \
+		QTDIR="${QTDIR}" \
+		styledir="${QTDIR}/plugins/styles" \
+		DESTDIR="${D}" \
+		install
 
 	# 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/"
+	cd "${D}/usr/share/gdm/themes/Bluecurve/" || die
 
 	# replace redhat logo with gnome logo from happygnome theme, use .svg if >=gnome-base/gdm-2.14 installed
 	if has_version gnome-base/gdm >=2.14; then
-		sed -i -e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.svg"/>|' \
-		-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml || die
+		sed -i \
+			-e 's|<normal file="rh_logo-header.png"/>|<normal file="/usr/share/gdm/themes/happygnome/gnome-logo.svg"/>|' \
+			-e 's|<pos x="3%" y="5%" width="398" height="128" anchor="nw"/>|<pos x="3%" y="3%"/>|' Bluecurve.xml \
+			|| die
 	else
-		sed -i -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 || die
+		sed -i \
+			-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 \
+			|| die
 	fi
 
 	# Bluecurve GDM screenshot has redhat logo
 	# Theme copyright notice left intact... do not modify it
-	sed -i -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop
+	sed -i -e 's|Screenshot=|#Screenshot=|' GdmGreeterTheme.desktop || die
 
 	X11_IMPLEM="xorg-x11"
 
 	for x in Bluecurve Bluecurve-inverse; do
 		dodir /usr/share/cursors/${X11_IMPLEM}/${x}
-		mv "${D}/usr/share/icons/${x}/cursors" "${D}/usr/share/cursors/${X11_IMPLEM}/${x}"
+		mv "${D}"/usr/share/icons/${x}/cursors "${D}"/usr/share/cursors/${X11_IMPLEM}/${x}
 		dosym /usr/share/cursors/${X11_IMPLEM}/${x}/cursors /usr/share/icons/${x}/cursors
 	done
 
 	# remove audacious skin if unneeded
 	if ! use audacious; then
-		rm -rf "${D}/usr/share/xmms"
+		rm -r "${D}"/usr/share/xmms || die
 	else
-		mv "${D}/usr/share/xmms" "${D}/usr/share/audacious"
+		mv "${D}"/usr/share/xmms "${D}"/usr/share/audacious || die
 	fi
 
 	cd "${S}"
@@ -139,26 +133,12 @@ src_install () {
 	###
 	# Some extra features - allows redhat-artwork to be very light:
 	###
-	use gdm || rm -rf "${D}/usr/share/gdm"
-	use kdm || rm -rf "${D}/usr/share/apps/kdm"
-	use cursors || rm -rf "${D}/usr/share/cursors"
-	use icons || {
-		rm -rf "${D}"/usr/share/icons
-		rm -rf "${D}"/usr/share/pixmaps/*.png
-	}
-	use nautilus || rm -rf "${D}/usr/share/pixmaps/nautilus"
-
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "This version provides more control over what is installed"
-	einfo "than previous version."
-	einfo
-	einfo "Please check your USE flags."
-	einfo
-
-	epause
-
+	if ! use gdm; then rm -r "${D}"/usr/share/gdm || die; fi
+	if ! use kdm; then rm -r "${D}"/usr/share/apps/kdm || die; fi
+	if ! use cursors; then rm -r "${D}"/usr/share/cursors || die; fi
+	if ! use icons; then
+		rm -r "${D}"/usr/share/icons || die
+		rm -r "${D}"/usr/share/pixmaps/*.png || die
+	fi
+	if ! use nautilus; then rm -r "${D}"/usr/share/pixmaps/nautilus || die; fi
 }