version bump (fixes bugs #393027, #292120 and #434518)

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 250 insertions, 13 deletions

diff --git a/app-admin/eselect-xvmc/ChangeLog b/app-admin/eselect-xvmc/ChangeLog
index 02388d6d0548..55086388c177 100644
--- a/app-admin/eselect-xvmc/ChangeLog
+++ b/app-admin/eselect-xvmc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-xvmc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-xvmc/ChangeLog,v 1.26 2012/08/27 17:33:27 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-xvmc/ChangeLog,v 1.27 2013/03/11 14:36:20 ottxor Exp $
+
+*eselect-xvmc-0.4 (11 Mar 2013)
+
+  11 Mar 2013; Christoph Junghans <ottxor@gentoo.org> +eselect-xvmc-0.4.ebuild,
+  +files/eselect-xvmc-0.4.eselect, metadata.xml:
+  version bump (fixes bugs #393027, #292120 and #434518)
 
   27 Aug 2012; Raúl Porcel <armin76@gentoo.org> eselect-xvmc-0.3.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #424017
@@ -90,4 +96,3 @@
   +files/eselect-xvmc-0.1.eselect, +metadata.xml,
   +eselect-xvmc-0.1.ebuild:
   Decided to write an eselect module for XvMCWrapper. First version.
-
diff --git a/app-admin/eselect-xvmc/Manifest b/app-admin/eselect-xvmc/Manifest
index 1133faf4dfdf..f324c430c6d4 100644
--- a/app-admin/eselect-xvmc/Manifest
+++ b/app-admin/eselect-xvmc/Manifest
@@ -1,18 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX eselect-xvmc-0.1.eselect 3835 SHA256 76d3b735ac543994dfca3a3208b13dbe24f7a0463864e78950ac92b00b20726b SHA512 2d7fa6bbb35dabc5fcbcb3b993186cb7df87a97b28df259dbf9853e52e528865ac6ddaacb1e524147ddcf8f8bfc176b859be2b4231761864adbb2512e9fd4bb2 WHIRLPOOL 4feef75edab38ef95b9083657890c5ef36fa3cf02c4ba46f9597229922194bf61c81b51c5486e14d3e19f5e815d3e0fbafb62c26c7368d3b8b4fca35192d00c2
 AUX eselect-xvmc-0.2.eselect 3859 SHA256 5bb36b96de0068e3e15486015c809766d9bc0ef86f6fc0c81ad17e7f9db3b048 SHA512 01bfa8e22a61d6031501dfef468086aa4a6f8ff6656c842b01f4359ffe5c847c7b3d0af8a033af2e0e561efcde320fb8553f1b20875c6dab40717fb3f05b36bf WHIRLPOOL d3969fc9645567f2a4b757bab949c710e2b36bcac9d4242a465aa6149c0465dca06dcc4dc4e2e52c5602b913186e4bf782ef8cb3c3f18cd9ec47e4c9838c511c
 AUX eselect-xvmc-0.3.eselect 3967 SHA256 3e1f7fffbdcf112b832c87fd62149f712ec2fbb4ef51c76b2321d7e396b986fe SHA512 dc54f0394f21748d1aa7a0456cf2bf761d2067d14755a642aa1880b1b41a47c7516f2d8c68d54d177b54f206169387ede8210cbde82f5151d61db823e4c5003e WHIRLPOOL e1486bd200b8f653f37382fd8b4ffab15499fd262a800320ad2ffce6ccde4c261a02dcbfa70b4314ed041b42ceee038afbf2b321a998b6634ed3a504c7ba99f0
+AUX eselect-xvmc-0.4.eselect 4167 SHA256 7ab493019a9cd3763d82402ce82e21690e1958cd91e777c77d57c4ebd160c69d SHA512 bbce12b6f5052457354f7486a03fd7b1be0ebdff9373f9a5edba5df47c71ddf851e29cdb9343aac283487dd7b08590403e3aea595b80e1e85dd64f4fd75e0f2e WHIRLPOOL 2a0f31a9c87d83f262a2cc2039865dd574dbd9475f0de08597621d8d35e14ea956e070a03d2fce48cab948eaaca5722a6ba7dbee6082e29f214bde01cee726db
 EBUILD eselect-xvmc-0.1.ebuild 622 SHA256 1399ae8c47b86427d0f00fc097d0731679c0fff33d73238f228476be76d740b9 SHA512 7c08ce2a916e58382155e13ab4b7ec70ee4035bc91a9f7fd94ed4fcc3c846b14071b45094f89b418652c35d41d8746ecd7b87ab7ee8e26b847e228a8a3a38fe0 WHIRLPOOL b488b447ce7def02fa6406200ef8632f2c74ede7a31da6807bdd3a0530d0e178f768b371246ff1f1e78db1c0f3385892fab9ff9575dad28adf0332db9dbc3cd8
 EBUILD eselect-xvmc-0.2.ebuild 620 SHA256 f2aa6e3ae0564cdcd78a1975d4c3e855b6cf992a93a7a0d6f593134b4b7be666 SHA512 3eec6449523b983330e9078f692db2c3a606dfcef7f6bb16487a48f718d904885b6501445289c1c01231dc51724f8e34e60b57d0e76f6d01b8d1c7d194e88dc8 WHIRLPOOL 4d731ed09d1572fd94183fa706759fcad46a3482b7621e432fbf2c79741a20f342aec62e42bfdb503c07c277855dd69e9e496d3a0ed2c1d881ce129228ce4f71
 EBUILD eselect-xvmc-0.3.ebuild 636 SHA256 0575b71bb2a382c5645b14daf2b7a907c00404ad820ab443846d7160054f9720 SHA512 3ea8484c4282f0eaa84401da29685671759257f9833ca2124e0d3f8a55a585cf08098a093cd6f7bc8e68da8b830879839e4387a160030b37db1b86beb47d9b90 WHIRLPOOL 0b63d323fa48ab6c00981b4f41e58958d7f391cb2fa1cad856c435ca2c867cec254d26ec77ea6bf47d43d318a58de54ed04f72bfd81c65bf3921d829c1ca8768
-MISC ChangeLog 3404 SHA256 42ffaaf1f5638f134cd73c738497a0a0a92cfa1bf195af07bdac4aadd47bc13b SHA512 05e1c4e41113cead2f8f3363bdfdde6db9b38411e63a37f8b264ed29cfcdd4aba013787138938b361f8860ff977492f45b1093c013484ca4c2d52c2ad2b30d1c WHIRLPOOL a74fafebf4dc7f18a10e58c140978b5a7a43a842b85a50952d79e52e27e5be9bc205daeaf4e98fcaddb8b39af2bfbbf1abfd63b77a54057a642cba474f1a1d37
-MISC metadata.xml 201 SHA256 8f75fc60785c44922fb01cde68caa6453b815502745e057680d2c923733fb70a SHA512 84a5327ed4c5c64a425ec34c4658d077df5992688f6ad1b39c1f84f0e4a58663ba06c78a963423815d11f9b1cdfc3919a5d6f999e4f4f49c8c06627c60cfc2ec WHIRLPOOL 614e7c517ef569cba692b091fd5a3bd55ce0df2e5b3e0b4ce20bc08abc1c017b1cb8fe0bf95a68175dd0994942eb4669022d369c17a425cc86c431a73e1ee093
+EBUILD eselect-xvmc-0.4.ebuild 640 SHA256 726900b5ec0fda93bf18d6a48f99a8597b9c8ef300024365c56323b445542f04 SHA512 4eba0daf43b65bb4fbd952393d8cbece0aa3954632b292a20c8d7886f10e03e44c18938d5b6183b3fc1caf8a34c392919e0f7d5ab797ed94ec7a5a4c1f07c31f WHIRLPOOL f8233adf2ac38624aadf92170b8019157b63e54460732a5227c061479fc19a842a1175325a423195f4965127cd3a4dda5e3f5256a36b6182c006da46debc4098
+MISC ChangeLog 3622 SHA256 667ca09b35cb1c965636046064bc9f71cba0f36d8bb6d64923f5ed746eea8f83 SHA512 64fa287a866b638d27a3cbbeed66f5a77bb6586153dc7e8183b90ae611512bdc1556e3bfe8c61bf21d2ef0521a40a6920908a27de9823ef30a6060c34a4a6a64 WHIRLPOOL a41871d6f37f2116f79769b633f54397a8d0655eb1a8219ffbf306a0e774d75b33c2769be5e7ec38c20dd42d1ec8f91808e6b388d5cc233dcc766603da2637e5
+MISC metadata.xml 301 SHA256 324f2204f9dc5c251892cce0a7831884ee271d4170fc86fb33ce7b2aae28b2a8 SHA512 0e315170dcc6c64ecf4893ba8c0df7a74155257b86a397d23d3fa8208c5fdcd1574c6f877c1fd4d4ae34ad17997b6416820ec808519b3dfd770019e794bd5007 WHIRLPOOL ad6989b2aadd62bc1c33c85296be649e3b7abbeec04f352115202917b0e4e6cf4b39d3bfe24b2d572dfa585fee989ac92e6205e7b71038826bee5af7ccfc8d7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlA7r20ACgkQuQc30/atMkD7egCfQRZWLnMEY63v0xXtNAecDB8o
-gVIAoIN4GC+ntdzqz9h6FDpxavi62qOo
-=+0yU
+iQEcBAEBCAAGBQJRPevrAAoJEOeBhlrCAAWG3rQH/10FjthfRwWlmFtKomQFfeWW
+OyAFqeedCUKr7LXD150v1kIJGhV8D3CSS0120vK8GNmqcOEkdUoi80K5gS35C1vH
+Cr4kZpxk3j+5umRgIaKAnqVcESpZn9PuG2tMCOaJQzg9uEsMFIx7Y7yHvhT6CRg5
+Qvq36+rNK3qi8SUBXrkjeas2kkD6K15g1XxjEHLTuIVEd6x0D9jHI8tdo9Vm5siC
+HCpd+j8lnA+jz49+viTt9oDmb3WciuPTZRHXQhYWCN9im8RUToEhKPCuFAx7T6FL
+WHrrfRK0DYgw0Y0ffyKbQMut9MjpY0AbIH4vh/+8GnkFavOwpbvQkAbeScecfLI=
+=nKeo
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-xvmc/eselect-xvmc-0.4.ebuild b/app-admin/eselect-xvmc/eselect-xvmc-0.4.ebuild
new file mode 100644
index 000000000000..b54b45d9092c
--- /dev/null
+++ b/app-admin/eselect-xvmc/eselect-xvmc-0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-xvmc/eselect-xvmc-0.4.ebuild,v 1.1 2013/03/11 14:36:20 ottxor Exp $
+
+EAPI=5
+
+DESCRIPTION="Manages XvMC implementations"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-admin/eselect"
+
+S="${FILESDIR}"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${FILESDIR}"/${P}.eselect xvmc.eselect
+}
diff --git a/app-admin/eselect-xvmc/files/eselect-xvmc-0.4.eselect b/app-admin/eselect-xvmc/files/eselect-xvmc-0.4.eselect
new file mode 100644
index 000000000000..eefd56675945
--- /dev/null
+++ b/app-admin/eselect-xvmc/files/eselect-xvmc-0.4.eselect
@@ -0,0 +1,198 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage the XvMC implementation used by your system"
+MAINTAINER="{cardoe,ottxor}@gentoo.org"
+VERSION="0.4"
+
+init_XVMC_vars() {
+	get_libname() {
+		case ${OSTYPE} in
+			darwin*) echo ${1:+.}${1}.dylib ;;
+			*) echo .so${1:+.}${1} ;;
+		esac
+	}
+
+	XVMCLIBS=(
+		"libXvMCNVIDIA_dynamic$(get_libname 1)"
+		"libXvMC$(get_libname 1)"
+		"libviaXvMC$(get_libname 1)"
+		"libviaXvMCPro$(get_libname 1)"
+		"libchromeXvMC$(get_libname 1)"
+		"libchromeXvMCPro$(get_libname 1)"
+		"libXvMCVIA$(get_libname)"
+		"libXvMCVIAPro$(get_libname)"
+		"libI810XvMC$(get_libname 1)"
+		"/usr/lib/libIntelXvMC$(get_libname)"
+		"libAMDXvBA$(get_libname 1)"
+	)
+
+	XVMCPRETTY=(
+		"nvidia"
+		"xorg-x11"
+		"via"
+		"via-pro"
+		"openchrome"
+		"openchrome-pro"
+		"unichrome"
+		"unichrome-pro"
+		"intel-i810"
+		"intel-i915/i965"
+		"ati"
+	)
+}
+
+get_implementation_indices() {
+	local ret n
+	for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
+		[[ -e "${EROOT}/usr/lib/${XVMCLIBS[n]##*/}" ]] && ret+=($n)
+	done
+
+	echo ${ret[@]}
+}
+
+get_current_implementation_index() {
+	local n
+	if [[ -f "${EROOT}/etc/X11/XvMCConfig" ]]; then
+		local current=$(< "${EROOT}/etc/X11/XvMCConfig")
+		for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
+			if [[ "${XVMCLIBS[n]}" = "${current}" ]]; then
+				echo "${n}"
+				return
+			fi
+		done
+	fi
+
+	echo "-1"
+}
+
+set_new_implementation() {
+	echo -n "Switching to ${XVMCPRETTY[$1]} XvMC implementation..."
+	touch "${EROOT}/etc/X11/XvMCConfig" 2>&1 > /dev/null
+	if [[ $? -eq 0 ]]; then
+		echo "${XVMCLIBS[$1]}" > "${EROOT}/etc/X11/XvMCConfig"
+		chmod 644 "${EROOT}/etc/X11/XvMCConfig"
+		[[ ${EROOT} == "/" ]] && chown 0:0 "${EROOT}/etc/X11/XvMCConfig"
+		echo " done"
+	else
+		echo " failed!"
+		echo "Insufficient privileges"
+	fi
+}
+
+### list action
+
+## {{{ list stuff
+describe_list() {
+	echo "List Available XvMC implementations"
+}
+
+do_list() {
+	local output n
+	init_XVMC_vars
+	local avail=( $(get_implementation_indices) )
+	local current=$(get_current_implementation_index)
+	write_list_start \
+		"Available XvMC implementations ($(highlight '*') is current):"
+
+	for n in "${avail[@]}"; do
+		output[n]=${XVMCPRETTY[n]}
+		[[ ${current} -eq ${n} ]] \
+			&& output[n]=$(highlight_marker "${output[n]}")
+	done
+	write_numbered_list -m "(none found)" "${output[@]}"
+
+	return 0
+}
+## }}}
+
+### show action
+
+## {{{ show stuff
+describe_show() {
+	echo "Print the current XvMC implementation."
+}
+
+do_show() {
+	init_XVMC_vars
+	local current=$(get_current_implementation_index)
+	write_list_start "Current XvMC implementation:"
+
+	if [[ ${current} -ne -1 ]]; then
+		echo "${XVMCPRETTY[current]}"
+		return 0
+	else
+		echo "(none)"
+		return 2
+	fi
+}
+## }}}
+
+### set action
+
+## {{{ set stuff
+describe_set() {
+	echo "Select the XvMC implementation"
+}
+
+describe_set_parameters() {
+	echo "<target>"
+}
+
+describe_set_options() {
+	echo "<target> : XvMC implementation to activate"
+	echo "--use-old : If an implementation is already set, use that one instead"
+}
+
+do_set() {
+	init_XVMC_vars
+	local current=$(get_current_implementation_index)
+	local avail=( $(get_implementation_indices) )
+	local n new action
+
+	while [[ ${#@} -gt 0 ]]; do
+		local opt=${1}
+		shift
+		case ${opt} in
+			--use-old)
+				if [[ ${current} -gt -1 ]]; then
+					(( ${current} < ${#XVMCPRETTY[@]} )) && action="old-implementation"
+				fi
+				;;
+			*)
+				[[ -z ${action} ]] && action="set-implementation"
+
+				if is_number ${opt} ; then
+					new=${avail[opt - 1]}
+					if [[ -z ${new} ]]; then
+						die -q "Unrecognized option: ${opt}"
+					fi
+				elif has ${opt} ${XVMCPRETTY[@]}; then
+					for (( n = 0; n < ${#XVMCPRETTY[@]}; ++n )); do
+						[[ "${XVMCPRETTY[n]}" = "${opt}" ]] && new=${n}
+					done
+				else
+					die -q "Unrecognized option: ${opt}"
+				fi
+				;;
+		esac
+	done
+
+	case ${action} in
+		old-implementation)
+			set_new_implementation ${current}
+			return $?
+		;;
+		set-implementation)
+			if [[ -n ${new} ]]; then
+				set_new_implementation ${new}
+				return $?
+			else
+				die -q "Please specify an implementation to set"
+			fi
+		;;
+		*)
+			die -q "Invalid usage of set action."
+	esac
+}
diff --git a/app-admin/eselect-xvmc/metadata.xml b/app-admin/eselect-xvmc/metadata.xml
index 877ed7af7da8..a0494aadf4b2 100644
--- a/app-admin/eselect-xvmc/metadata.xml
+++ b/app-admin/eselect-xvmc/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>cardoe@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<maintainer>
+		<email>cardoe@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>