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

(Portage version: 2.2_rc23/cvs/Linux x86_64)

5 files changed, 27 insertions, 64 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/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"
+}