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

(Portage version: 2.1.1-r1)

5 files changed, 114 insertions, 3 deletions

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>
+