fix display of implementations as reported by phajdan.jr in bug 320189, fix by Andrea...

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/app-admin/eselect-miniaudicle/ChangeLog b/app-admin/eselect-miniaudicle/ChangeLog
index 4031df6da43747244628829227c7bee769d58dfa..7d0953e33b76bb21afd19ebcf0c94dfd619bae84 100644 (file)
--- a/app-admin/eselect-miniaudicle/ChangeLog
+++ b/app-admin/eselect-miniaudicle/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/eselect-miniaudicle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-miniaudicle/ChangeLog,v 1.5 2010/05/24 15:18:38 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-miniaudicle/ChangeLog,v 1.6 2010/07/15 07:43:08 fauli Exp $
+
+*eselect-miniaudicle-1.0.1-r1 (15 Jul 2010)
+
+  15 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  -eselect-miniaudicle-1.0.1.ebuild, +eselect-miniaudicle-1.0.1-r1.ebuild,
+  +files/miniaudicle-1.0.1_list.patch:
+  fix display of implementations as reported by phajdan.jr in bug 320189,
+  fix by Andreas Schürch
 
   22 Mar 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:

diff --git a/app-admin/eselect-miniaudicle/Manifest b/app-admin/eselect-miniaudicle/Manifest
index bba06a3e27a76546ea8ff77f69529409bec97d9a..c6609ac12ee2350b7a5deaa6352c71f2830256a8 100644 (file)
--- a/app-admin/eselect-miniaudicle/Manifest
+++ b/app-admin/eselect-miniaudicle/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX miniaudicle-1.0.1_list.patch 605 RMD160 4aa5030597ecc24207f73d4d22a835d902b89c46 SHA1 d385c335df952e7e59163b996688a653bc05e527 SHA256 dbc14445651fb51cd45bb5f2b2f49c33a3b9e917b464bab25c7b7c630c216f21
 DIST miniaudicle.eselect-1.0.0.bz2 1287 RMD160 dba64c1d739d6082180b5a61c797a8877aef7b46 SHA1 11c2fa906970ce39e6aa88380aa3352e18dda0c0 SHA256 1e3135fc4f4e23b4a910c7c4bd090378dab9a4804fd2b0a0e462d7e727af916d
 DIST miniaudicle.eselect-1.0.1.bz2 1284 RMD160 72151b367c123373932ac6235f139aab4da10e42 SHA1 818f27bd038d42e8a3b0847970c03eacb6f09d14 SHA256 c5ff356568e0903385b938192bd59dc2d32867419431ef2336ff48e19415a64b
 EBUILD eselect-miniaudicle-1.0.0.ebuild 613 RMD160 949525aedda37abb56f5943dc4074afa048cab21 SHA1 85e63659124dddc16ce6b1f51bb6a4e4f883df2f SHA256 7389ccb77f55866e706eff209f7dffdde227765bf62b175c2d6fb97e3a433609
-EBUILD eselect-miniaudicle-1.0.1.ebuild 619 RMD160 c8a3831ba88eb8b71e65812a47b20a79108bda60 SHA1 6d36d4612e8a7b3cd73a4a957eb3ec8c96748320 SHA256 bcf42474f20ceecd61967f93c4c9668f0fcc48766ec94aaf509e7d8538ff9cb4
-MISC ChangeLog 663 RMD160 d3eddef994abde2604c7bc4287b66be325ff8f5d SHA1 259d6cdee7b0bd1d5177c15f3653bfd92c0b61b0 SHA256 07d9923c74dae5f42c12a1583ed0a682f8a4cf9ecdf4da3b374acb25773b435a
+EBUILD eselect-miniaudicle-1.0.1-r1.ebuild 771 RMD160 f6a8e69d68292337b1b7036fd94a838d4bfc4dec SHA1 b2bd893c5320f313f3f3824bed980c774c5ec0d3 SHA256 b0ac9d5ceb58f7e20960b053a8eb1e84e69473c4978b7675d4f59788375f37fc
+MISC ChangeLog 973 RMD160 63b840b715de7a63a01403c284006257f5210105 SHA1 322aacc4eefb72c0e625cd77f999d491aa93af91 SHA256 cf7bfa6f366543fc5b534a8bc1a2204ce66008bbdc10212cd762b757bdd1cdff
 MISC metadata.xml 253 RMD160 0d03ad6796d1056ad1f7f5ae6a70780a178a0203 SHA1 a00d78dd7783ebb1297e6c54d3f253fe0d301dee SHA256 eb0dfae19e157111078e665b6cccf9e106be9140f112e8747e189777b855d339
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkw+vIYACgkQNQqtfCuFneNrHwCePU8dxO1tqpVbLwy0JaAYj1Yk
+tLEAn04ZZnx2NcXA79A+GfrgFw/n3/nW
+=uAxL
+-----END PGP SIGNATURE-----

diff --git a/app-admin/eselect-miniaudicle/eselect-miniaudicle-1.0.1.ebuild b/app-admin/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r1.ebuild
similarity index 53%
rename from app-admin/eselect-miniaudicle/eselect-miniaudicle-1.0.1.ebuild
rename to app-admin/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r1.ebuild
index 76e732aabf6af56ed8006235da15fd99c1e2ae1e..965075ddf92b16a3653f933dc37c4672c8159079 100644 (file)
--- a/app-admin/eselect-miniaudicle/eselect-miniaudicle-1.0.1.ebuild
+++ b/app-admin/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r1.ebuild
@@ -1,10 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-miniaudicle/eselect-miniaudicle-1.0.1.ebuild,v 1.3 2010/05/24 15:18:38 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r1.ebuild,v 1.1 2010/07/15 07:43:08 fauli Exp $
+
+EAPI=3
+
+inherit eutils
 
 DESCRIPTION="Manages the /usr/bin/miniAudicle symlink"
 HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/miniaudicle.eselect-${PVR}.bz2"
+SRC_URI="mirror://gentoo/miniaudicle.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -13,7 +17,12 @@ IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3"
 
+src_prepare() {
+       # Fixes listing as described in bug 320189, not upstream yet
+       epatch "${FILESDIR}"/miniaudicle-1.0.1_list.patch
+}
+
 src_install() {
        insinto /usr/share/eselect/modules
-       newins "${WORKDIR}/miniaudicle.eselect-${PVR}" miniaudicle.eselect || die
+       newins "${WORKDIR}/miniaudicle.eselect-${PV}" miniaudicle.eselect || die
 }

diff --git a/app-admin/eselect-miniaudicle/files/miniaudicle-1.0.1_list.patch b/app-admin/eselect-miniaudicle/files/miniaudicle-1.0.1_list.patch
new file mode 100644 (file)
index 0000000..cb29780
--- /dev/null
+++ b/app-admin/eselect-miniaudicle/files/miniaudicle-1.0.1_list.patch
@@ -0,0 +1,12 @@
+--- miniaudicle.eselect-1.0.1.orig     2010-07-14 23:21:11.000000000 -0400
++++ miniaudicle.eselect-1.0.1  2010-07-14 23:22:22.000000000 -0400
+@@ -73,7 +73,7 @@
+       targets=( $(find_targets ) )
+       write_list_start "Available miniAudicle audio engines:"
+       for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
+-              [[ ${targets[${i}]} == $(basename $(canonicalise ${ROOT}/usr/bin/miniAudicle ) ) ]] && \
++              [[ ${targets[${i}]} == $(basename $(canonicalise ${ROOT}/usr/bin/miniAudicle- ) ) ]] && \
+                       targets[${i}]=$(highlight_maker "${targets[${i}]}")
+       done
+       write_numbered_list -m "(none found)" "${targets[@]}"
+