Fix bashisms, bug #256337. Clean up old revisions.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 33 insertions, 73 deletions

diff --git a/x11-themes/gnome-themes/ChangeLog b/x11-themes/gnome-themes/ChangeLog
index 300d2cd8943f..da057544ef71 100644
--- a/x11-themes/gnome-themes/ChangeLog
+++ b/x11-themes/gnome-themes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gnome-themes
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.197 2009/01/14 22:26:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.198 2009/02/02 22:05:41 eva Exp $
+
+  02 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-themes-2.24.3-bashism.patch, -gnome-themes-2.20.2.ebuild,
+  -gnome-themes-2.24.1.ebuild, gnome-themes-2.24.3.ebuild:
+  Fix bashisms, bug #256337. Clean up old revisions.
 
 *gnome-themes-2.24.3 (14 Jan 2009)
 
diff --git a/x11-themes/gnome-themes/Manifest b/x11-themes/gnome-themes/Manifest
index 1e6548e4b41b..baef5869d97a 100644
--- a/x11-themes/gnome-themes/Manifest
+++ b/x11-themes/gnome-themes/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnome-themes-2.24.3-bashism.patch 524 RMD160 bdbeb167d71dbaa242dd12a5bae979602d2dbe04 SHA1 cb26e34e085cb6b135a58cf9241308990c40aa4b SHA256 f94fbd406d38ad0878c01f8cbe75573ae21545e42b67b2c51f4248e2cf714b28
 DIST gnome-themes-2.20.1.tar.bz2 2408805 RMD160 f6d7780da9b784f14d0ee9f991fb53fdabf8ed02 SHA1 6371222169808a94ff982fd01f0ebb5053cc85f7 SHA256 87cb9a0beaf1e5c3a90147a8aba7bcb6e594b918fa3316a7fa23b60a498a26ee
-DIST gnome-themes-2.20.2.tar.bz2 2403213 RMD160 763dc1377606833d16c180b9991a89ee80169c76 SHA1 16f23925a6740b915faff53d7d639f21665ed647 SHA256 14ecc315eeb58e6d7fad676ad39f9da3a4938bfabf1a01540232fc5a1a8c433c
 DIST gnome-themes-2.22.2.tar.bz2 1498952 RMD160 08cf832e650ba020cab16c0fe6fd83dce08f97a3 SHA1 ec386aea350cd22d1a5769a8ca011f59660d9ff6 SHA256 b6047835d6fae7269825028c4f7da2c1ff380c023fbd58ac69fdea8a707bac77
-DIST gnome-themes-2.24.1.tar.bz2 1541349 RMD160 f871db08c37dac11395d78178e90368d26faa721 SHA1 7d537eabe8c855a9b841fa92e633ad0b243a4dda SHA256 d58cf38d4f3eb715d7faa95c3e824aba6aa49d19147efe992e48beabbf33eb62
 DIST gnome-themes-2.24.3.tar.bz2 1505357 RMD160 26aac887bf42f938eba0fa3f8569dfd2af6d01eb SHA1 d6e53ccf9b767cf8352ff7876a98424a44a009a5 SHA256 8f13e281a2b4363a980de2edbf16cd1ce0c895f84496f00758c29e00c929bf97
 EBUILD gnome-themes-2.20.1.ebuild 786 RMD160 81966a802d185bcff19508607ce00a9fc0d356f0 SHA1 bb444c58c148eae436e35ad041fb440d8abe46ed SHA256 59e87a4c15be1ad2f476214dfb1f5a07c0fb3a431fc5fc08494a55222026c36e
-EBUILD gnome-themes-2.20.2.ebuild 839 RMD160 ad94e7f217686ddf5a14072a4ac6af9c3725946d SHA1 fc80b744cd64d1a98e1855ef35944cfb9802d2ac SHA256 6c90d2a7559abcd35e7d99538482708e2e1eedb42164168e82c414abb27ce366
 EBUILD gnome-themes-2.22.2.ebuild 848 RMD160 9fb73b7954d62f4a36ee67f13e78a61a76e3c748 SHA1 e6c5c71909bc6d5d691086e46a28b8d414f063e5 SHA256 1960fc40c798094a2e6e38202a7f0f02f9c132b235f8d70dfbdd27b6ee44c048
-EBUILD gnome-themes-2.24.1.ebuild 908 RMD160 b4af281d2053e40fa539d2c4e4b0fe1cb8083b27 SHA1 0ab63cb194af027b1006b96f4b2b20ade2f2be57 SHA256 434a68d1b712c0b71c220c9f283f35eda00e8a9664c6d65ececb74c1a5bddf16
-EBUILD gnome-themes-2.24.3.ebuild 907 RMD160 b1eb89208cb9f40c1f5eb9db92dddc2aa3b254b9 SHA1 259ae15bf02d1072a74aad0de98e2f1b9d06cc7f SHA256 a72c9b270870e38c9f7c83e14ccc8a5ebe5d84355f03f38b6b12ed0f16a30648
-MISC ChangeLog 24170 RMD160 0771b8c854da6985e52b642a0d35808b56e35e02 SHA1 f0f31a20188c156f205674b49aaff6e7deb41b59 SHA256 e6016948a17dca0b6c6bde5e22fec30ca131888aa7be1a7c1873c3d8594b4d99
+EBUILD gnome-themes-2.24.3.ebuild 1015 RMD160 79eb1538c3aad39f972e0a76405d8355c6fb9228 SHA1 b32eb4cabc339ffda8324022dd028dcaaf9f61f5 SHA256 9b04081dd9f0417d7dbf0a2d557aa42e97a9f1dcb7f150dcf4709871157af5fe
+MISC ChangeLog 24410 RMD160 3cec2729db38a29b0c2daa55364549dcd5f2903b SHA1 ea8b0169cc9f0a3e577b33f24e7973a436d5baf4 SHA256 bb98b3332bdf0cb0a5dd2dad0b505800eacd2fe019a45f618b666f74f6c5bb8b
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkluZpQACgkQ1fmVwcYIWAY/AwCeMlZaL/9KZJtziKZ7C9zZDMRm
-DzkAoI1PS9zP4YAvLTV1vg3OCACtWSfb
-=nRTP
+iEYEARECAAYFAkmHbjoACgkQ1fmVwcYIWAbloQCgvH88zhv9chRI2Q7+5NHPgWM4
+RjQAoKR9sy6lN6ZwrD17OyKHCTTxDDDm
+=+z5X
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gnome-themes/files/gnome-themes-2.24.3-bashism.patch b/x11-themes/gnome-themes/files/gnome-themes-2.24.3-bashism.patch
new file mode 100644
index 000000000000..382766f24c18
--- /dev/null
+++ b/x11-themes/gnome-themes/files/gnome-themes-2.24.3-bashism.patch
@@ -0,0 +1,13 @@
+# https://bugs.gentoo.org/show_bug.cgi?id=256337
+# http://bugzilla.gnome.org/show_bug.cgi?id=550927
+--- a/common/mkiconlinks.sh	2008-09-04 17:15:42.000000000 -0500
++++ b/common/mkiconlinks.sh	2008-09-04 17:16:31.000000000 -0500
+@@ -16,7 +16,7 @@
+ while [ ! -z "$NEXTLINE" ] ; do
+ 
+ 	# Skip lines beginning with '#'
+-	if [ ! "${NEXTLINE:0:1}" == '#' ]; then
++	if ! echo ${NEXTLINE} | grep -q "^#" ; then
+ 		#Extract first field, minus its trailing colon
+ 		ORIG_FILE=`echo $NEXTLINE | awk '/:/{print $1}' | sed -e 's/://'`
+ 
diff --git a/x11-themes/gnome-themes/gnome-themes-2.20.2.ebuild b/x11-themes/gnome-themes/gnome-themes-2.20.2.ebuild
deleted file mode 100644
index 0dfa27cd61a5..000000000000
--- a/x11-themes/gnome-themes/gnome-themes-2.20.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.20.2.ebuild,v 1.8 2008/02/04 04:23:35 jer Exp $
-
-inherit gnome2
-
-DESCRIPTION="A set of GNOME themes, with sets for users with limited or low vision"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="accessibility"
-
-RDEPEND=">=x11-libs/gtk+-2
-	 >=x11-themes/gtk-engines-2.9"
-DEPEND="${RDEPEND}
-	>=x11-misc/icon-naming-utils-0.8.0
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable accessibility all-themes)"
-}
diff --git a/x11-themes/gnome-themes/gnome-themes-2.24.1.ebuild b/x11-themes/gnome-themes/gnome-themes-2.24.1.ebuild
deleted file mode 100644
index 196664a991db..000000000000
--- a/x11-themes/gnome-themes/gnome-themes-2.24.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.24.1.ebuild,v 1.1 2008/10/20 22:09:14 leio Exp $
-
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A set of GNOME themes, with sets for users with limited or low vision"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="accessibility"
-
-RDEPEND=">=x11-libs/gtk+-2
-	 >=x11-themes/gtk-engines-2.15.3"
-DEPEND="${RDEPEND}
-	>=x11-misc/icon-naming-utils-0.8.0
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable accessibility all-themes)
-		--enable-legacy-icon-mapping"
-}
diff --git a/x11-themes/gnome-themes/gnome-themes-2.24.3.ebuild b/x11-themes/gnome-themes/gnome-themes-2.24.3.ebuild
index 52b13a1517d0..391196c2c1b7 100644
--- a/x11-themes/gnome-themes/gnome-themes-2.24.3.ebuild
+++ b/x11-themes/gnome-themes/gnome-themes-2.24.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.24.3.ebuild,v 1.1 2009/01/14 22:26:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.24.3.ebuild,v 1.2 2009/02/02 22:05:41 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -31,3 +31,10 @@ pkg_setup() {
 		$(use_enable accessibility all-themes)
 		--enable-legacy-icon-mapping"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix bashisms, bug #256337
+	epatch "${FILESDIR}/${P}-bashism.patch"
+}