version bump (bug #529042), fix bug #529098

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB2EFA1D4

5 files changed, 25 insertions, 85 deletions

diff --git a/media-sound/apulse/ChangeLog b/media-sound/apulse/ChangeLog
index d845c7e3a19f..0d32225d634f 100644
--- a/media-sound/apulse/ChangeLog
+++ b/media-sound/apulse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/apulse
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/ChangeLog,v 1.4 2014/11/14 20:48:46 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/ChangeLog,v 1.5 2014/12/01 15:59:48 jauhien Exp $
+
+*apulse-0.1.4 (01 Dec 2014)
+
+  01 Dec 2014; Jauhien Piatlicki <jauhien@gentoo.org> +apulse-0.1.4.ebuild,
+  -apulse-0.1.1.ebuild, -apulse-0.1.2-r1.ebuild, -apulse-0.1.2-r2.ebuild:
+  version bump (bug #529042), fix bug #529098
 
 *apulse-0.1.2-r2 (14 Nov 2014)
 
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index 1760de388e6e..369dbbed9663 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,17 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST apulse-0.1.1.tar.gz 98851 SHA256 7415ca49de8e80c36825f59571cbcceb6f0eb88f79e3bcc3c7eec57f2b6c6076 SHA512 bfea1e8b87cd90e6bad01d7e80a1236997097bf8578e8917d83fa72e5b1d51905c011f71646db9a822cf23487ea2d9ca36e7bc188ddb4a0947852966f7bab505 WHIRLPOOL 1dc6d839d867d4afc62affd157dbc46307fae2d0ecc18e2dc726c1b742049a62300f6b14aea4c11cbae408fd230f5074b41d2410dd6e13044bf8741908f5b614
-DIST apulse-0.1.2.tar.gz 99051 SHA256 7e066199d962cf0d30dfc9d09dfe636698d0bc880a63b8e5fc5f721e91322009 SHA512 2f70347e692ed018f2aa5177665e70e742daa4b1424a57c737cf40ca504bb6d1d8f55c61a3b24b6927796656dfa50c8e844880dbb223aebe87a2dd2d323c612d WHIRLPOOL e2f01de2cb16838c77c017d06f80cfb21c21103254be40d56acca2480ae900c3adedfa2978eff9c2b2e80151c358cad4e461be617e9d7857404f77c280eecac2
-EBUILD apulse-0.1.1.ebuild 819 SHA256 b8530926e5819926f8f1715ff3df5e20292f2ebd4a65dc68e390e20e57202305 SHA512 e8f7b8625236eda30acd4be69009438e223cfd67ded24dc795c4adfeadfa86157794b839516fcd782181b9bbf6245b62b253eff15159b4500e0a02b01782aabf WHIRLPOOL e4823d41366813a598f618c8b0810bc05fe7942862686bb1154eb966614de52ba5fa5abf0ad2600dfd7623ada2015196ad8f9d3b5a06df8a1688beeba50536b8
-EBUILD apulse-0.1.2-r1.ebuild 1104 SHA256 4218f44bc17957e3ea01f5d52b8842aab39da7bfe7a53a2160c56499ea42c8c6 SHA512 bc7d7f360bb9e4fa729b95a968c6085f53f991de2c03a75f738f65748ad17c85b28022d1c1fbe59f46d3bb315eaefb47f29d524bdc309e9274212d9be2ded5bd WHIRLPOOL 0fb28c5e009f6e0f9ad294300f34c261c868ac99090be84acb681443cc0d60a300ec0cebeb0b4cd170ec2ae071b2b665896c6a4e1ed81b0abff502092f26a980
-EBUILD apulse-0.1.2-r2.ebuild 1015 SHA256 db127ba6029cb41a756d4e2273400be005eef767cc67625c625d30a6fb297f74 SHA512 5ce741eb44239a8012b853677d564c13cda553138e18b948384af92e9ae49297741948c02a220eb569ba0a47f8fb96430d8129eb98d419b508e8ef3f357a3511 WHIRLPOOL d8d5e0a26abbb9bf777bc4232ebbc4f8df5e7f1470e000631a67e057ff0b4d1bfe06497dbb064bf8a4f4006a24cdbb8194f48ab91e4bdb78e0fcd5ba159eb9d2
-MISC ChangeLog 1007 SHA256 b3067868a83e5e3a0406eeb5c513595891d630486db9a1e7d07f7a189f6e4d78 SHA512 d13dd06899da60edd08d97ca02a360fd1d2303797df94f83371fe3b18ad99b7f7840caa57974cde2d567ddcd974d5fb0b988055c619dd487e56fbf65de1de2fd WHIRLPOOL 7f306135adb12f11015ace770c66544e6bd22cd510a692b0d8173f032e3ea567ca5d82eaa5e466981e4f340c53beb06c472563591fca5d853124811ad4c52f1e
+DIST apulse-0.1.4.tar.gz 99976 SHA256 717bc537c389af546b4db2ed7622a8896f7f0f306612c9eb6c693a70c104c86f SHA512 500abca0f6b4df35acb417744a5967e58ceff8cc2a0d640db03847d79b077295abe8888ee5d0008383349bd964345a340334f39e1f55286713db94a86c6596dc WHIRLPOOL 7fe604ed3128cb24d375f4f84ee77317fd499202d8bf46f9c68735501b35a55050852d08260b2c4ad0419ac32a3d330946c65aa402b9b66dbf6d25c3a92966bb
+EBUILD apulse-0.1.4.ebuild 1023 SHA256 5044641149177714e9e4d18d216b44bebc6d9c6a8bd5fc3cd6b5b5c1db9d93d3 SHA512 04fd7aa556542e9f8f5bf17e46edbe771e0514e9f60569d314e01ec34c0ac07e0ebfed3cc185cfb90da53637990b617d430e55ca756a837b7a0b99cbb458729f WHIRLPOOL 43153a6ead7c88bc9aa581f9cfd92e453b78c096ceb4929ac3a38bc9f790ee9ebfff73def3df16592fd9c4a470370fcde96b9c070177f6dc96be9c9a9907aa9a
+MISC ChangeLog 1237 SHA256 5e6dd6e6b0959ca48ec708b2ffe1ae4d90e370199a02eb4d54542c94fcd37a12 SHA512 b6eeb03d85f927646f0b7813bd1433f5bb0e7a1fcf4e652a136f43c8a682352dedd63a255d92f1e217caceecda4a6b30bee8136cc09638babf6300550d5358a9 WHIRLPOOL d747de811376598ea1a5203f7621fe2424bfe081d638758e93577cc8df511e858f8978e15b4727c589a3da3c745b8c64de42c9f31fcd074bc981cbdf667bcebc
 MISC metadata.xml 202 SHA256 66924d1d7f45f552c62ec96ec663c0af1c93a721ab42ee8f13ddb36bb5d0ae35 SHA512 3f45e8572f4ebed4c3fa9cec5d0f440b0316939f57866bc245e5fe95532c5aa260debaae7fa8bbfda83fd56b609d8fb0c11717325a8f0d6abd4dd2e21c6b4f07 WHIRLPOOL 517078266cdd2f27f28acc76d2ab6620c4a9bdc018119feaf451c79fcf4ba6cceef9d95ac85e18db29503805b58c99415eec802609307221abd8635ecf200f79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRmargACgkQ2ugaI38ACPBYCQD/a7aGzjuyKibUHMQxmAeKkFEm
-QxaAowe/OiLmBzEE8HcA/0hieur6G5eySJmA/2ud26L+cyo4c3aommRNu7ADszjU
-=rmw3
+iQIcBAEBCAAGBQJUfJB+AAoJELvuk32y76HUj4YQAIZ+sY9FcYGb52aNZXZbRlqY
+VESf83B8yT7FsR+yf+/y3TwOE/2yvAG3caqLl/iq6nGzaM8j36Bd6dh59r4cepSQ
+vgRvUVnMnoCWai9D7DW6DmSryKMUO5XvQDYmoUBf2YLd0wKNKl3TebasTgjFByh6
+cdMcIR6B7aOL8xC3jn2m5/Pb48uN+Ap7iwRbucR+qES7LaoJDktMAOSNlz6/2njy
+JN/NCGpVXOrewcOrQiakrv97/gB5T9J5aoD1hcoxQfxr4GpBr3+8bXnQ1+t6UdWe
+MnSZI/gcHX+7SOZPnKyHbhaac8+j1POqdvqFHEEY+28aO7TBMIh0VHnlZan2ci/b
+Y4xo6GR5s6YitQkJnDEmk0IadeDHYkIPTr+lTN06wXrRxKY+/c5K53VqqhUPiWqc
+ptfHXc74uxlfiXQX1kuhKvm6mEAtjq66zR8hUuVt4q69GHWlw27YhzAUHDLdZC/M
+JIE7MrRNSYMr4uqHgdBxOHSmOEu9E8dM0TMCzG8inFWs2fi6ya+vqryxsnE5xUP9
+FlzqDPn+vKPgADwEEQOeNTcj42Vp0J8ybyMcZUnYPTWsTSHUC/s5LPlyMQpJbisH
+3FOtAxCir3I0qlePLvJMQIBF0YoaicTnGExDmrWWMW0cf8aKQzWl60X7+uLYiLp/
+NBZ5wYGeExgMb0+t9jc6
+=3oqs
 -----END PGP SIGNATURE-----
diff --git a/media-sound/apulse/apulse-0.1.1.ebuild b/media-sound/apulse/apulse-0.1.1.ebuild
deleted file mode 100644
index e90bcad5e1d6..000000000000
--- a/media-sound/apulse/apulse-0.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.1.ebuild,v 1.1 2014/10/05 09:08:44 jauhien Exp $
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	!app-emulation/emul-linux-x86-soundlibs
-	!media-sound/pulseaudio
-"
-RDEPEND="${DEPEND}"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
-
-multilib_src_configure() {
-	local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)"
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/apulse/apulse-0.1.2-r1.ebuild b/media-sound/apulse/apulse-0.1.2-r1.ebuild
deleted file mode 100644
index cd41ece70f6a..000000000000
--- a/media-sound/apulse/apulse-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.2-r1.ebuild,v 1.1 2014/11/10 22:26:38 axs Exp $
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="media-libs/alsa-lib
-	dev-libs/glib:2
-	!<app-emulation/emul-linux-x86-soundlibs-20140508-r1
-	!app-emulation/emul-linux-x86-soundlibs[pulseaudio]
-	!media-sound/pulseaudio
-	amd64? ( abi_x86_32? ( || (
-			media-libs/alsa-lib[abi_x86_32(-)]
-			>=app-emulation/emul-linux-x86-soundlibs-20140508-r1[-abi_x86_32(-),-pulseaudio]
-		)
-		|| (
-			dev-libs/glib:2[abi_x86_32(-)]
-			app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		)
-	) )
-"
-RDEPEND="${DEPEND}"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
-
-multilib_src_configure() {
-	local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)"
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/apulse/apulse-0.1.2-r2.ebuild b/media-sound/apulse/apulse-0.1.4.ebuild
index 67428ef38cbe..404eec7f5426 100644
--- a/media-sound/apulse/apulse-0.1.2-r2.ebuild
+++ b/media-sound/apulse/apulse-0.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.2-r2.ebuild,v 1.1 2014/11/14 20:48:46 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apulse/apulse-0.1.4.ebuild,v 1.1 2014/12/01 15:59:48 jauhien Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
 
 multilib_src_configure() {
-	local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)"
+	local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse"
 
 	cmake-utils_src_configure
 }