Version bump to allow fox-1.6, updated date for fox-wrapper-1.ebuild

Package-Manager: portage-2.1.1-r1

6 files changed, 136 insertions, 10 deletions

diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index 139c78f52525..ec0bec76a431 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -5,21 +5,36 @@ AUX fox-wrapper-1.sh 2022 RMD160 db8485dd1cc598821db1da405c2d3edcb51d5512 SHA1 1
 MD5 bda17181fe6497f64ccd32cc142d08e8 files/fox-wrapper-1.sh 2022
 RMD160 db8485dd1cc598821db1da405c2d3edcb51d5512 files/fox-wrapper-1.sh 2022
 SHA256 9061c867577e98b6d19c49f3002f4178df5009f1492db3d7f85eaa0d8ee463eb files/fox-wrapper-1.sh 2022
-EBUILD fox-wrapper-1.ebuild 627 RMD160 6172ffa729d371bf69de107b2f03289fb0c7466a SHA1 d7e2130624c5fa96c2427872a56aec9cf1bf1f0f SHA256 f50727ca0f0ca1443ad9a19ccf0a787626ba0a90212f8926e7c6b99ff270b218
-MD5 dd935ae44ace2c5d5148e741b0036b38 fox-wrapper-1.ebuild 627
-RMD160 6172ffa729d371bf69de107b2f03289fb0c7466a fox-wrapper-1.ebuild 627
-SHA256 f50727ca0f0ca1443ad9a19ccf0a787626ba0a90212f8926e7c6b99ff270b218 fox-wrapper-1.ebuild 627
+AUX fox-wrapper-2.sh 2021 RMD160 6783c3c72babf3f7bd0d7b90011b098d277cae91 SHA1 a690a589ae993f45ba057e1d88342e5881a76618 SHA256 847101bbb6ffc11dc343457424cf52cd7a4b5c074d52a62700f97875ad8915a2
+MD5 261f0819a5b6c8cd1b20c8cde3af9d69 files/fox-wrapper-2.sh 2021
+RMD160 6783c3c72babf3f7bd0d7b90011b098d277cae91 files/fox-wrapper-2.sh 2021
+SHA256 847101bbb6ffc11dc343457424cf52cd7a4b5c074d52a62700f97875ad8915a2 files/fox-wrapper-2.sh 2021
+EBUILD fox-wrapper-1.ebuild 622 RMD160 fa218f8ed1fd92759e13f5f8fa805cc6c1d7e7b8 SHA1 42069916dff3b1bed12a56610dc6f764166ddae8 SHA256 a0749571738c095197b2f0f0c3d670241357a048abed44e755f782aeef574bf3
+MD5 48f99aea840cdfe483a2c1e1aee22f1e fox-wrapper-1.ebuild 622
+RMD160 fa218f8ed1fd92759e13f5f8fa805cc6c1d7e7b8 fox-wrapper-1.ebuild 622
+SHA256 a0749571738c095197b2f0f0c3d670241357a048abed44e755f782aeef574bf3 fox-wrapper-1.ebuild 622
+EBUILD fox-wrapper-2.ebuild 622 RMD160 e660909950dceabaaa4c118c73611d26355d1bb9 SHA1 b20865ced45d9ed62d005303e038138119865687 SHA256 66803b7184dbcc7375722bd4636ea6bcc13aa2a889a8bb32a600cfcf1844ec65
+MD5 c316cbbc62636d8e03157a2f96e2cba5 fox-wrapper-2.ebuild 622
+RMD160 e660909950dceabaaa4c118c73611d26355d1bb9 fox-wrapper-2.ebuild 622
+SHA256 66803b7184dbcc7375722bd4636ea6bcc13aa2a889a8bb32a600cfcf1844ec65 fox-wrapper-2.ebuild 622
 MISC ChangeLog 388 RMD160 d1b4e720128e3c8287debf40716fb0265911c0e4 SHA1 fa6b530fbfe276d9ed917d41f676d3d2fbf0b83d SHA256 1ea65c680833bedba5163e70dec5781a6a3671564c652dfdcdba0942c17810fa
 MD5 d58c6edb0934f6c329689401770ffb23 ChangeLog 388
 RMD160 d1b4e720128e3c8287debf40716fb0265911c0e4 ChangeLog 388
 SHA256 1ea65c680833bedba5163e70dec5781a6a3671564c652dfdcdba0942c17810fa ChangeLog 388
+MISC metadata.xml 252 RMD160 f4deb2f64422a7b54a0ad589122193929e9b1b69 SHA1 b05479ced1eab39ad009f0e87f1b47c1a1c38263 SHA256 f149d7a4a5a345adb6368e42a7daa0e97e4990f56741d19ee4c6b39aea98e96c
+MD5 0e120306171259139d459df47a25e6f1 metadata.xml 252
+RMD160 f4deb2f64422a7b54a0ad589122193929e9b1b69 metadata.xml 252
+SHA256 f149d7a4a5a345adb6368e42a7daa0e97e4990f56741d19ee4c6b39aea98e96c metadata.xml 252
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-fox-wrapper-1 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-fox-wrapper-1 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-fox-wrapper-1 1
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-fox-wrapper-2 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-fox-wrapper-2 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-fox-wrapper-2 1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFA9beamhnQswr0vIRAv/SAKChUxxgoODY/kgPEJ3ybnjTsMcfLwCfQ3/J
-fRIboyeTm7WsvV1DkeOJx9Q=
-=KS1D
+iD8DBQFFQ+1kfNMcoUhJ7GwRAu4MAJ9YY+719O2fbO1iBPE84uSZBBkwyQCcC1qY
+BJI1qhZfEmDdNVcCrut9AOU=
+=a4Ot
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fox-wrapper/files/digest-fox-wrapper-2 b/x11-libs/fox-wrapper/files/digest-fox-wrapper-2
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/x11-libs/fox-wrapper/files/digest-fox-wrapper-2
@@ -0,0 +1 @@
+
diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh b/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
new file mode 100644
index 000000000000..8dd302a340ab
--- /dev/null
+++ b/x11-libs/fox-wrapper/files/fox-wrapper-2.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-2.sh,v 1.1 2006/10/28 23:52:59 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.2 1.5"
+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.2\" 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-1.ebuild b/x11-libs/fox-wrapper/fox-wrapper-1.ebuild
index 4407a0a8e705..bb1974488f0d 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-1.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox-wrapper/fox-wrapper-1.ebuild,v 1.1 2005/05/07 19:38:54 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox-wrapper/fox-wrapper-1.ebuild,v 1.2 2006/10/28 23:52:59 mabi Exp $
 
 DESCRIPTION="wrapper for fox-config to manage multiple versions"
 HOMEPAGE="http://www.gentoo.org/"
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
new file mode 100644
index 000000000000..14699108d42e
--- /dev/null
+++ b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox-wrapper/fox-wrapper-2.ebuild,v 1.1 2006/10/28 23:52:59 mabi Exp $
+
+DESCRIPTION="wrapper for fox-config to manage multiple versions"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
+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/fox-wrapper/metadata.xml b/x11-libs/fox-wrapper/metadata.xml
new file mode 100644
index 000000000000..aec2935e0815
--- /dev/null
+++ b/x11-libs/fox-wrapper/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>mabi@gentoo.org</email>
+		<name>Matti Bickel</name>
+	</maintainer>
+</pkgmetadata>
+