1.7 support, dropped 1.2,1.5

Package-Manager: portage-2.1.6.7/cvs/Linux ppc

4 files changed, 122 insertions, 3 deletions

diff --git a/x11-libs/fox-wrapper/ChangeLog b/x11-libs/fox-wrapper/ChangeLog
index c643a5703782..0a5d888f77d4 100644
--- a/x11-libs/fox-wrapper/ChangeLog
+++ b/x11-libs/fox-wrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fox-wrapper
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox-wrapper/ChangeLog,v 1.16 2007/04/09 22:43:03 kloeri Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox-wrapper/ChangeLog,v 1.17 2009/03/01 22:58:16 mabi Exp $
+
+*fox-wrapper-3 (01 Mar 2009)
+
+  01 Mar 2009; Matti Bickel <mabi@gentoo.org> +files/fox-wrapper-3.sh,
+  +fox-wrapper-3.ebuild:
+  add a new wrapper for 1.7, loose 1.2 support
 
   09 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> fox-wrapper-2.ebuild:
   Stable on Alpha, bug 164296.
diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-3.sh b/x11-libs/fox-wrapper/files/fox-wrapper-3.sh
new file mode 100644
index 000000000000..45561d6e4597
--- /dev/null
+++ b/x11-libs/fox-wrapper/files/fox-wrapper-3.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox-wrapper/files/fox-wrapper-3.sh,v 1.1 2009/03/01 22:58:16 mabi Exp $
+
+# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1)
+#
+# Executes the correct fox-config version, based on the value of WANT_FOX.
+# All versions of fox after 1.0.x ship with a fox-config script
+#
+#
+# Stable branches first, in descending order, then unstable branches.
+# After a new stable branch, prepend the new version and bump (or remove)
+# the last unstable branch
+#
+vers="1.6 1.4 1.7"
+bindir=/usr/bin
+
+if [ "${0##*/}" = "fox-wrapper.sh" ] ; then
+	echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2
+	exit 1
+fi
+
+if [ -z "${WANT_FOX}" ] ; then
+	echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2
+	echo "             WANT_FOX=\"1.6\" fox-config $@"
+	exit 1
+fi
+
+for v in ${vers} ; do
+	eval binary_${v/./_}="fox-${v}-config"
+done
+
+#
+# Check the WANT_FOX setting
+#
+for v in ${vers} x ; do
+	if [ "${v}" = "x" ] ; then
+		echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2
+		echo "             Valid values of WANT_FOX are: ${vers// /, }"
+		exit 1
+	fi
+
+	if [ "${WANT_FOX}" = "${v}" ] ; then
+		binary="binary_${v/./_}"
+		binary="${!binary}"
+		break
+	fi
+done
+
+if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then
+	echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2
+	echo "fox-wrapper: DEBUG: will execute <$binary>" >&2
+fi
+
+#
+# for further consistency
+#
+for v in ${vers} ; do
+	mybin="binary_${v/./_}"
+	if [ "${binary}" = "${!mybin}" ] ; then
+		export WANT_FOX="${v}"
+	fi
+done
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${bindir}/${binary}" ] ; then
+	echo "fox-wrapper: $binary is missing or not executable." >&2
+	echo "             Please try emerging the correct version of fox, i.e.:" >&2
+	echo "             emerge '=x11-libs/${binary/-config/}*'" >&2
+	exit 1
+fi
+
+"$binary" "$@"
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
new file mode 100644
index 000000000000..8f19c9bb1b28
--- /dev/null
+++ b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox-wrapper/fox-wrapper-3.ebuild,v 1.1 2009/03/01 22:58:16 mabi Exp $
+
+DESCRIPTION="wrapper for fox-config to manage multiple versions"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}
+
+src_install() {
+	exeinto /usr/lib/misc
+	newexe ${FILESDIR}/fox-wrapper-${PV}.sh fox-wrapper.sh || die
+
+	dodir /usr/bin
+	dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
+}
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index c4bc10e3415d..b917e16c39c6 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
 AUX gtk+-1.2.10-automake.patch 3270 RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e SHA1 1ba127d50f7eddc86e07a37c819b9dd233d27926 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2
@@ -14,6 +17,8 @@ AUX gtk+-2.12.10-no-libintl.patch 691 RMD160 2290b968d630720e73225f08eefd5ccbba9
 AUX gtk+-2.12.9-libtool-2.patch 920 RMD160 3ef1dfe66e89af4fe9b51d662e6cc3f7fdaa6e3d SHA1 2e788ff62ed2bffc7c3f5e7900466a3fa0f95b3b SHA256 0f9c8c0700d22c55dff1e943651a20165dc3de510e00169e6f03c7e57063abfb
 AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734
 AUX gtk+-2.14.7-filechooser.patch 13798 RMD160 0c1ef9582cb82693bb2cf0e80478b30276b9b835 SHA1 d163af3af1a19f2c88a0d811f87615448e40a45e SHA256 38cdee07dadf6d8612b55958f6af57e0e70a0f0974c30452d6b8a9943653caf4
+AUX gtk+-2.14.7-ignore-gtkcurve.patch 4458 RMD160 c74312ebe9febae6449f61d757e587d30d237ce0 SHA1 ee0fe90c1c2262d94e67ca5e6561591a52e82e72 SHA256 748d23b31c29b93f168599b579bbb2ee7beba518f18a8e12b69f62d4835c35b7
+AUX gtk+-2.14.7-uncertain-mime.patch 770 RMD160 141ed81f793a74e193f814b6f118e926e10a0f93 SHA1 fd5e6282f7fca578de521011e2b1b2d3a35a533b SHA256 767d0c2d8a5d63b1ae63868e731c7e21cdae57f1f5930a62c7385ef98869fa43
 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd
 AUX gtk+-2.8.10-xinerama.patch 1083 RMD160 499801f3be2289bdc656563bb5c96797d14512f7 SHA1 7817e3c2bbec1058192d524d68e78635fa48beca SHA256 7786691d5f89588abc7174e97cbd374d8cbe98b4e8dfd27005eade03b047aa2d
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
@@ -34,6 +39,14 @@ EBUILD gtk+-2.12.8.ebuild 4676 RMD160 b0271ae3aafb496ac80b0d1b629dc64cc3c4a05d S
 EBUILD gtk+-2.14.4.ebuild 4523 RMD160 591512449b641e80837a418734ad71a34d22f38e SHA1 76f45e8f1d697258e8fa6867877b65be49769005 SHA256 ea5eca06e4d8afa3b72321b77da182b6724d544fa19e2bfadb8171ed83f4d846
 EBUILD gtk+-2.14.5.ebuild 4523 RMD160 205bf04ebe1f2d0faadfdbed0a4095bed3f71a21 SHA1 638d81d7a5b88907e88445ee7a6cfe701c852385 SHA256 1dfe63b3f6b37112a349fd6a62f51c0f2df31b926175b3ec9aa4a43262c0cd4e
 EBUILD gtk+-2.14.7-r1.ebuild 4624 RMD160 b9d69852737725e7c9c4ad12116b27e236ef6e63 SHA1 24b51b53ed7001019a3321e7f49b786f088be8d3 SHA256 4cc5512d8505b844696ca1d0638d7b1e326c40cd484ef23f9ef32509e15a17d0
+EBUILD gtk+-2.14.7-r2.ebuild 4847 RMD160 f3b2f48667ad4bdc6801f7faf52585ab9a6ff351 SHA1 f07edaba56b38da066aa485eff53fe1123868971 SHA256 f2ba765639d23962ab158d31997bae346fe371c915b4d9e8a3c297971467b75d
 EBUILD gtk+-2.14.7.ebuild 4524 RMD160 a5d9d2cc52a77f1181d6ebb58cafee669b4b45cb SHA1 7c760da88f0c7ff67a7039f833012735005859df SHA256 7cf7a07904a2e163024e29cf843f76166d561e69b7fd35f5ea49d11f60aeeab7
-MISC ChangeLog 60310 RMD160 2169939520839ec56a8496ca13b90875e949e0bb SHA1 2676e1650f88a637b40b7fb009c97ebfd25fd5fe SHA256 dbc72c7e6191522f5082ecd5f55568d53c87015c9bf060c51bc8ff66ecad4765
+MISC ChangeLog 60615 RMD160 fa143bfce2679ecc7f0a61500cbf7e08e7fbd063 SHA1 827f9587520deac393f0f9e3a9891ba08cbc7605 SHA256 d3cccb1c99daa1151b091f99cfc7be433dccf54cd87a5d37d9f0b1af9d807023
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmrE8YACgkQ1fmVwcYIWAZdkACfQfyolm1L0QSAN6Hw/J/aFCpi
+6IUAoKb24Yho3rL2DZotzzqlCMxwrqtv
+=f2c6
+-----END PGP SIGNATURE-----