add prefix support (bug #508438)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 155 insertions, 15 deletions

diff --git a/app-admin/eselect-wxwidgets/ChangeLog b/app-admin/eselect-wxwidgets/ChangeLog
index 7c6f3e842023..b57008b08547 100644
--- a/app-admin/eselect-wxwidgets/ChangeLog
+++ b/app-admin/eselect-wxwidgets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-wxwidgets
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.68 2014/03/24 15:08:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/ChangeLog,v 1.69 2014/04/23 19:55:09 ottxor Exp $
+
+*eselect-wxwidgets-20140423 (23 Apr 2014)
+
+  23 Apr 2014; Christoph Junghans <ottxor@gentoo.org>
+  +eselect-wxwidgets-20140423.ebuild, +files/wx-config-1.4, +files/wxrc-1.4:
+  add prefix support (bug #508438)
 
   24 Mar 2014; Agostino Sarubbo <ago@gentoo.org>
   eselect-wxwidgets-20131230.ebuild:
diff --git a/app-admin/eselect-wxwidgets/Manifest b/app-admin/eselect-wxwidgets/Manifest
index ce53ef4eb67b..97da486ddfb1 100644
--- a/app-admin/eselect-wxwidgets/Manifest
+++ b/app-admin/eselect-wxwidgets/Manifest
@@ -2,29 +2,27 @@
 Hash: SHA256
 
 AUX wx-config-1.3 920 SHA256 735c0253b0ccc004854b489db17be404fbfb84dbad8a44aa4edc4d4fddb33e04 SHA512 0c5d1693040909a46668f4cfc1f11b1225e245a2dce60cfa2557f49ac37ee25eb8fea28dae90ab3a8263133ed43b817753e2ad9207a3e9f1157925fc85028fcf WHIRLPOOL c2236ff7007eda48d62295cb5d9d588d1392c2a43ab8f89fd592ad5ad8f417612f70425780c83f2bd5b8d86f379f7984ae8f6997284877617acddd4e528d0e09
+AUX wx-config-1.4 1012 SHA256 6f9300cbccbe59df0f698b1485d4854b51b80315d3ae53436b4aac6ccc9b0b66 SHA512 a6ca333599e00648586e84c3bb05242085bed386b2db28b22521dcde9e777b350996dc0866fa12f8f7735bf04340a5f0f672eea6fb65603443262bede7cd4794 WHIRLPOOL 831518dd42f7400890591c7f71a14f209a2ef4b399f382841316cbca2673427db034d21cb11c51314e5a91ab4e921a9ca24d9842b26548dcf4b0c2164c141d79
 AUX wxrc-1.3 934 SHA256 89a8366e8e9dc603d4a96fdae807c852259c696f4e802f2e5d833929bf4053dc SHA512 762fd2ac77988e1b9dc1bf8e61af2d03bfaac73677d3d845bb26ddf6e935ceb7f4dd073ff2df1f4ca0bb8aad260f37f52ba753e517d6464a4d3e566565a2a298 WHIRLPOOL d9b0bbf4e3102cdce434a2a3ac0b275a691bca2da9796a3114b7c947f4cc6c297f65515a15d84eb050328c2912620af77939bfdc27ae2e977cec0a40f823e24d
+AUX wxrc-1.4 1026 SHA256 38afb2885f592d9f2eec2ef8c07e58af2d852904418ef76e31940b848784d173 SHA512 369e1569858ff82fb413b78376a36b41a18f0ef2a885db126be4a589ee371bf02df15df9608f4f2612a39c33bef8a9e860cd09416c02df6c3f5eb8914add43bc WHIRLPOOL 6b54ee230de3f3aad9bb390b4fc855777989bac2498058dcf81a42c669079f78725d648892d688d97746f73ddc4d3c7482a6e25f6982cd9a7e5333a0cb0f9e69
 AUX wxwin.m4-2.9 40702 SHA256 fec6eabf456c24e5920e561b539d1e06036125a3a4a76ba9ac7208c586c95710 SHA512 c698d9ae4781b9e556562fb9865166c9c2632c3ae8e2f7b5da073004c6a07c9447f8ac9ae63704530b32dd7946c64779f470b4ece67f460df6a631475a80e94b WHIRLPOOL 108179bc99e6d1ea909569f06cb04fd9d10f923e20df187d5b6098f57205f2bb91024530bc7c9899c8495c77a8dcd5187cfa5c3d0099c381078117e07b4329ff
 AUX wxwin.m4-3.0 40561 SHA256 08a3f7384bfe89cfe7a56f79fc0664d7344a727c64f645d6cbb7edd1874be7f9 SHA512 34268dff8878ab329e0b6e95bb0c5da5cb2b03103b1529a33216f73511e11041d9a5fed14e5df68cbee628377f474c5113e63155dd2dea0386afbf1235ae867d WHIRLPOOL 37d46164b199c3cec74180646e4638643e5719caa13f12de8bc7231450027dd0f18d457b5ab7b71b6c29aa955fcb42e4438a0e5aa88d339ff218b41238085c7e
+DIST eselect-wxwidgets-20140423.tar.xz 6792 SHA256 e97d5734f4b0e314abdaa1a9ee148cdafed74e1cdc036e01e6ac74599736e1bb SHA512 0d83e0b6979803c8a02c20ac33a42c91fd8d350c095e26704a80c1913309f0e7d741cc466ab22e0a6ce4773deab21ca80756299a12a83d441ded968531003d0e WHIRLPOOL 31108a15a0f3774c7a5959de946c741b758d818f1dbf09f96d633e354c086863684f431a6ac59a63f559f0c65482f790a95c7dc431dc91b7b48ec4e4a2c9c730
 DIST wxwidgets.eselect-1.4.bz2 2375 SHA256 630d2a79e3c1a124a124a81db1213e1c036a5c49a5bf06a328b164d997725386 SHA512 02cd876c040d2ea2589527530e7c570c94a1ca7cae867488ec5cf4509d21386d89cb128364aff80d64d0aa29e334209f02abb6e7baf890ff9bb0c22f606fc8fd WHIRLPOOL a3d0c88cba4634d1b390f912b3bc1750f2ef06cf2d5865c3a5c958538f7fc0c664edb59693340d5c7a1e3cb4e49737400a932c14841a77ec19bff07860d99514
 DIST wxwidgets.eselect-20131230.bz2 2228 SHA256 7c3c87931b6887cf1e6c486b17fb71fefcdf6fcf8089fe09d7f70ae17e3e0722 SHA512 0406cfbc5c39d2e65b22d0e8d70ea08ea9e348342d7bc1725dd8655fdedd883fd29e14263ad95737523d6285e081ef4558c4dec00c4a9ea9b9ef01ce537978e5 WHIRLPOOL 60a0ea44ddf1faab42a63f3717aa9d1234713eb40897025b7de8ad7f64f3a77c3399f084eb3a67e236b42963d7d793f0026ea17c10ffd3328fa109218a3deebe
 EBUILD eselect-wxwidgets-1.4.ebuild 1566 SHA256 773c4965511e0304f113a994757a1152144a9b7acd5c0d4fa5947efe7aebcc35 SHA512 698c19a9dea44a314ae5d49d2865b8260634599ea59e2b4d500f2c88d35e3d3f04a796b45f5bf641d421de8b7b6a9b40db440c676da9a2d7aa9517e1be113dc0 WHIRLPOOL c61de8c720c60469def08ca2c818e01e081e1fd18ca1f188461ccff7d86278bddd76835bcf33c4003f4de43228d3b99f4f18d9c3c380f6823dce5d9e1f6c41d3
 EBUILD eselect-wxwidgets-20131230.ebuild 1328 SHA256 92a20a720e0436487d19f79ee02e3d6c3287bb1d26f51447be024b0b5d7d6f51 SHA512 4de014a530e0cd485d7b7ac75d785095f523f3e8ac9c813258f2d5a399fd6d0a28dfa3d4061fc7b739e463b7ab8ba10a329a17462bd8761e8019b10d08684aac WHIRLPOOL 476975bb6409bbb9fa398d6df447d7062492c702f43acf4b81a644495e55c2770b241bac3e1c4681f4e599ecb8b02b12592eaa84ec45e4b0d10a9ed866be8e1f
-MISC ChangeLog 10392 SHA256 e7ae8dec5b872d1d9178e0b260fbb447f1e6ebd0a1c3837a80ce0aa09d24d3dc SHA512 65efbc80647741f0863597059d7ec426be691c8f966f43bdd6dc8a6cea4b43c505a6125f071c4027ef17e3d69001d9e480ebade31f807a92b63dd52eb2ad6821 WHIRLPOOL aef8a93f93f4d943310f024827210b4611df2e25fd79da1c5c572fbb854dbdc13c1c55d721ef8653d81d6a83e664ad04e3426278e86f22a7b3b317413e34d673
+EBUILD eselect-wxwidgets-20140423.ebuild 1556 SHA256 4083872ad6ff87b5aabf1e773d5250a8782e79102600cdcc8ecb7da3b705f83c SHA512 343365ba882b05f3f683cc9c91182abdf0c3327d677ab202ddb23e705e09b3384e083326bd38d3b2c1e015856f4573ef4d72f99d85613270ccf75d8c6d666eaf WHIRLPOOL 1f1d8be3f37b623143dda91de8c5942b98e778d03c0139544f2b4c33c3a36c864d47c5b1a73cef86664edbfd95c8eea57cd5d9d37347ee30eb71b54648bd8686
+MISC ChangeLog 10605 SHA256 8fcf0b424138000be63425b473c0139b1dbc23169e72ff563b41f40f0b798034 SHA512 ab914a1cce560a914861b4e8015d79c7b9a8c45e3f6e570909cc08f4ebe73fd33d7376a5515093c9137dca9ee9e22db7fe9fadd76c44b0f2bdcaeaa0b1765f5a WHIRLPOOL 6ccff0d9f537a68edb922acb7726963b7195ac42db77e13a5a1e2f518636c62771e4a53d8e20f83fd537f8bf9014c56e9f13beab1fa17b72d4a395e87414e4ce
 MISC metadata.xml 163 SHA256 f80859bf7a6a4f9003e458590a617debc14e3e1766004a67b368b327f3afc535 SHA512 3a0182534e9df7c61f18fd206b4ad6d9d9db4b9f339c5c8f13269abecc28acb674cfd4f3fadc5e8e0b4d9b52c938e29e86a3913724dc970b9ade6c2f0bbfc5b4 WHIRLPOOL c227f45d0239e047ef85bdb971666b887377a2db37727091a2e8a154d5ac7803df699db392b033ac389b9d827073e8a45f10889892688b1f080995c2c9ead032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMEp4AAoJELp701BxlEWfs4MP/2krDjX18kIxO4Bm/udcDITU
-yizYIrwAFBG8YjlBQ2pQ0n93iAO8DG639XzD0JjIY2DzAaVXGBo9Y/Divn4nr0sh
-kWMZa55wA7q7Pah496cinAABhNAIeX0sGvN2cJPbMqkQ8dY8phKbbMDwDZxF7jOZ
-6Z61+Nwa9hiXf6RRuH49jNY2wgAe/Rvw3HRb9T36G9EuaWG2sEXGzJqtMBHc+wWy
-QbdGOvl8yeOBZSlKExDovSyfIgeZx4Qw2HmBt5otUmktK7joL2kCffNkDSLvjdI6
-NlIZfnLSoh6zOG8oeAAkAboigdHEVHnd4jrrrkO4KSAxEUv4ojZQvJLnU1izH1cH
-VSVDNgiR3UmzuRi2hhE1X1gO4JZn5qsa52+LLlh/PACtxWcGUpERfehU27Ko7GYt
-zxlYe/hECSn5WeIBZiTbgkM8rzLzCyOPA9ekM1H7DUBJSYnz72ffKUObRfHL4ald
-22ADqVvF1g3WjB9S5oOSSWGHhM5dencUI9FIYwQBSbQwUaUr0ShMne6/Sqs3NumW
-ENtuivzjCtxbKdl4Rd/aZ3qxT+/iUmAcPhyhr0TUrkbTN70Har5k7M38LWPpNBte
-uL682rDeslHzeqi39qLd48UIX7KQWmaMuJa4wZ+9ssJ1rM621T3lSLbfalpuAONM
-X8bXAwnfJlgSkTEATX21
-=rwxr
+iQEcBAEBCAAGBQJTWBqlAAoJEOeBhlrCAAWGaVMH/0FaY5NbumX5YSVh8/DJhvEl
+PjO7HKwdz5UVMu9YeZ+v1WIDVxqTND6ZvMMk0IVGW3xJtrFbfYzRJdqgXD590iJ4
+flk1jYs11URAzGyinZfq9DVTVbUI/LkjPH8qQiTsXVhtW9im3osy3mJ2IoDWZtvf
+14Nt57QecrAOaJJR5jWbIRgXkPvVqPefzIyvPlMew9v8dkWF4V+4o7pd+USVyUg9
+TDydZF5c/WbFF7IfyC7VVRuNma/Qy8QJHxxLex0biLYj8c8qKnz8v6pKzkTZZxj1
+QHVsV4WDN6TLdOFAtJ5scT0syXz/O+XwmOZhc/i8MbFQZvcBh607ZffjDAFJV3Q=
+=J/c8
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild b/app-admin/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
new file mode 100644
index 000000000000..7e73d7504651
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild,v 1.1 2014/04/23 19:55:09 ottxor Exp $
+
+EAPI="5"
+
+inherit multilib
+
+WXWRAP_VER=1.4
+
+DESCRIPTION="Eselect module and wrappers for wxWidgets"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~ottxor/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
+
+src_prepare() {
+	cp "${FILESDIR}"/{wx-config,wxrc}-${WXWRAP_VER} . || die
+	sed \
+		-e "/^LIBDIR=/s:lib:$(get_libdir):" \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		-i {wx-config,wxrc}-${WXWRAP_VER} || die
+}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins wxwidgets.eselect
+
+	insinto /usr/share/aclocal
+	newins "${FILESDIR}"/wxwin.m4-3.0 wxwin.m4
+
+	newbin wx-config-${WXWRAP_VER} wx-config
+	newbin wxrc-${WXWRAP_VER} wxrc
+
+	keepdir /var/lib/wxwidgets
+	keepdir /usr/share/bakefile/presets
+}
+
+pkg_postinst() {
+	if [[ ! -e ${EROOT}/var/lib/wxwidgets/current ]]; then
+		echo 'WXCONFIG="none"' > "${EROOT}"/var/lib/wxwidgets/current
+	fi
+
+	echo
+	elog "This eselect module only controls the version of wxGTK used when"
+	elog "building packages outside of portage.  If you are not doing development"
+	elog "with wxWidgets or bakefile you will never need to use it."
+	echo
+}
diff --git a/app-admin/eselect-wxwidgets/files/wx-config-1.4 b/app-admin/eselect-wxwidgets/files/wx-config-1.4
new file mode 100755
index 000000000000..30080aca3418
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/files/wx-config-1.4
@@ -0,0 +1,41 @@
+#!/bin/sh -
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wx-config-1.4,v 1.1 2014/04/23 19:55:10 ottxor Exp $
+#
+# /usr/bin/wx-config
+#
+#  a lame wx-config wrapper (bugs to wxwidgets@gentoo.org)
+
+EPREFIX=''
+LIBDIR="lib"
+
+_wxerror() {
+	cat >&2 <<- EOF
+		An error occurred while calling wx-config:
+		
+		${1}
+
+		Please use \`eselect wxwidgets\` to select an available profile and try again.
+	EOF
+	exit 1
+}
+
+if [ -n "${WX_ECLASS_CONFIG}" ]; then
+	${WX_ECLASS_CONFIG} "$@"
+	exit 0
+else
+	if [ -e "${EPREFIX}"/var/lib/wxwidgets/current ]; then
+		. "${EPREFIX}"/var/lib/wxwidgets/current
+	else
+		_wxerror "Cannot find the wxWidgets profile configuration ( ${EPREFIX}/var/lib/wxwidgets/current )"
+	fi
+
+	[ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected"
+
+	if [ -x "${EPREFIX}/usr/${LIBDIR}/wx/config/${WXCONFIG}" ]; then
+	   "${EPREFIX}/usr/${LIBDIR}/wx/config/${WXCONFIG}" "$@"
+	else
+		_wxerror "Cannot find wxWidgets profile ( ${WXCONFIG} )"
+	fi
+	exit 0
+fi
+
diff --git a/app-admin/eselect-wxwidgets/files/wxrc-1.4 b/app-admin/eselect-wxwidgets/files/wxrc-1.4
new file mode 100755
index 000000000000..b9434de47b0b
--- /dev/null
+++ b/app-admin/eselect-wxwidgets/files/wxrc-1.4
@@ -0,0 +1,41 @@
+#!/bin/sh -
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wxrc-1.4,v 1.1 2014/04/23 19:55:10 ottxor Exp $
+#
+# /usr/bin/wxrc
+#
+#  a lame wxrc wrapper (bugs to wxwidgets@gentoo.org)
+
+EPREFIX=''
+LIBDIR="lib"
+
+_wxerror() {
+	cat >&2 <<- EOF
+		An error occurred while calling wxrc:
+
+		${1}
+
+		Please use \`eselect wxwidgets\` to select an available profile and try again.
+	EOF
+	exit 1
+}
+
+if [ -n "${WX_ECLASS_CONFIG}" ]; then
+	$(${WX_ECLASS_CONFIG} --utility=wxrc) "$@"
+	exit 0
+else
+	if [ -e "${EPREFIX}"/var/lib/wxwidgets/current ]; then
+		. "${EPREFIX}"/var/lib/wxwidgets/current
+	else
+		_wxerror "Cannot find the wxWidgets profile configuration ( ${EPREFIX}/var/lib/wxwidgets/current )"
+	fi
+
+	[ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected"
+
+	if [ -x "${EPREFIX}/usr/${LIBDIR}/wx/config/${WXCONFIG}" ]; then
+	   $("${EPREFIX}/usr/${LIBDIR}/wx/config/${WXCONFIG}" --utility=wxrc) "$@"
+	else
+		_wxerror "Cannot find wxWidgets profile ( ${WXCONFIG} )"
+	fi
+	exit 0
+fi
+