Version bump. Fix sandbox violation (bug #487304, thanks to Jura). Remove old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 29 insertions, 46 deletions

diff --git a/dev-libs/libmirage/ChangeLog b/dev-libs/libmirage/ChangeLog
index 9d7895720179..1c3cd4c8e4c5 100644
--- a/dev-libs/libmirage/ChangeLog
+++ b/dev-libs/libmirage/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libmirage
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/ChangeLog,v 1.33 2013/07/20 11:11:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/ChangeLog,v 1.34 2013/10/08 16:51:45 tetromino Exp $
+
+*libmirage-2.1.1 (08 Oct 2013)
+
+  08 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libmirage-2.0.0.ebuild, libmirage-2.1.0.ebuild, +libmirage-2.1.1.ebuild:
+  Version bump. Fix sandbox violation (bug #487304, thanks to Jura). Remove
+  old.
 
   20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> libmirage-2.1.0.ebuild:
   Stable for x86, wrt bug #477004
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index e09088592bf1..3ce0769cae80 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libmirage-2.0.0-gtk-doc.patch 1350 SHA256 9390996618c4b1126e5d298729617aae12b9f922799bd2a58337c5ad49cdf77f SHA512 92f1bf208d0a971dff218bd2747c8d1a867e9d6beae169d5b952481a247fbbb3a35b6b2216075de5b5ee0a367f637bf3f555787c06383f84ed8b749836bf0fc4 WHIRLPOOL bf795d64900d2fd39802dd843a3c4bbc4e355a9c9da3b92a473118a0c939d6c300ca30869878325da267e22f3568d983656162692b0e8eeba4dd63fe4d26b987
 AUX libmirage-2.1.0-DISABLE_DEPRECATED.patch 1435 SHA256 1472837bb9734fc5574c74f7f8f113d44eb6575de0c2a81a7890b2d95651155f SHA512 1c102ccb9d9863c18bf2645c08b1f2bec13ba2268d6bce0e069f98a611db2b15b0412e135f37950d0169b412355af8f32ab6b3f65d82b26cf6aa5d3b3526c857 WHIRLPOOL ffc14708d4ffcf227e082b8367d96f6a5dc1f93077e6180253be8db4ba0001ca9873ef6c00752f01ae494a70a239b1bc44ab702c3e79885f0c7d7031ce87c956
-DIST libmirage-2.0.0.tar.bz2 179521 SHA256 8392a145094e58bf6c01056543646ddd94a6d2a96e787f368b8102ae1d779a26 SHA512 178eb64ad2c38c76baa4dcfa8cc9e14f57fd96899990ac4bc39d19a19d18fe60ed15a8abbbd1b9921f449f6e96ce8a1828718e13e9a011230c8b6e9d42792e8b WHIRLPOOL 2a2f37caf8fedb12b608a379377949b20fd7cb2a80f73a9a605c46b220c6c17a1bde7a3875769ef010f50f3920819b0a57cf42eab14edafaf0e18c73f5822052
 DIST libmirage-2.1.0.tar.bz2 189908 SHA256 fb30eea15b8c1fc55e194e1af55127fa3b3860a79fec0b6c60588cf9ae8d1ca9 SHA512 7ef3a6cf04cce96ac474d90aaf12705f85dc4f5b5354eb27b5ad9e6452f992a20a7d6ab6421e0e7f6a3fabef563806ce6c9c272668cc4f9fb086b8ed1981dcea WHIRLPOOL 9e76eb1abe407e81e3583fc2407ce7dc6db70a8d57808a6e349819959d679d74cd9f9b0af3d70372753d3166179c253de8b6ebc3b805f11c5de0a6842c1e700c
-EBUILD libmirage-2.0.0.ebuild 1810 SHA256 b8d3c2f53d6aeb7e407b7e29d262f852d607e95ee4dc0cc5e95cb2dac8d46a11 SHA512 58fa9a96e1ed90753f1e15129cd4695b5682b4eddcc19f1f1a21c2e045f78d8286edfcda4f08b1e16fee0e522321ba095cc27cd328b96c6dfc1813e861b036a6 WHIRLPOOL d9d6952efda3f0f68e69b84b8a767859ea2c8459914e8c6a79f6a258a0936e109bb26e03f848db6a514bb3bd6e4387587d73213e71f27c0bd9c8132d230718a0
-EBUILD libmirage-2.1.0.ebuild 1350 SHA256 dfbe2d83717ca4cda5c37b6f513dda152b8c85d316d830356a8609e46e4c9499 SHA512 63f86e647c97fc21e656f826b9de72ca4cbc2206ac1ead04eaa4bd486e3513003476cdf489ccedb9b1d5c0bc6c88485c67344af1ae09cbb92128601e4500a7de WHIRLPOOL a456e3dbbaa8eed6b5a5d44541b4e858b961ffc152e23b583095bcbdf8fc99df0d943a46f8dad460a0c838e4b727888f71e2454c49541f8efe0bf22c1b629daa
-MISC ChangeLog 6038 SHA256 7a379251f62751a9e679dc270566edee9ea398f513c5143c7e6a99e3c9272051 SHA512 0092adfb96c179cf055062894b051b569e709e625169da4f6620f3946996c596e96dcaffff5bbab0fad1f9bf0941f85fe8425d45b0045e5602b24499e1af0a93 WHIRLPOOL 6da8606f6a3f19e711c5a1de5d36efb94393cf12b243cdb5b73a6aac7aa3f060dc90ab7072e9740d629a20edf286083be0995c5b7f6c280b7f66d8cd53c5c16e
+DIST libmirage-2.1.1.tar.bz2 190118 SHA256 f606391095200df510b923201881bfbadb6ab032035ce9a67aa24fcae3145108 SHA512 19e34e4f4546426dfe12f1dca65a8a8221d32be7c1b60313b8a4ed2ab0729508638a8b3acc74e44a29de7080b4cbc9d1590965b3a0e5a796756ff3a7f41ea652 WHIRLPOOL c09bcf628722a0a711c0e5280a6aed931e5b860e598354a48757bd941cb264cfc6d6f9a62d2cebc7c9e3a989276634a02ad3474ad499f2c0f86e1f6153856ef8
+EBUILD libmirage-2.1.0.ebuild 1418 SHA256 f5872064fd05ab1a9a69eb2150ea423c43290098b67735ff61fbef70290e08ea SHA512 053db4aae8fded870cc1357e3d652fdededc1884162a5c8a81364a8928d21368142edad19486f9230cc882497c0ef8523c815c8f7ccf4a0a17ec382d62d821be WHIRLPOOL 8056ded4b73111370f6a639b194a4466b5ace36794c898e4fc84289708e07222b382d249e04ffb9374c238115b2ef943116b1d4b6d498730dd51236886ae7fa3
+EBUILD libmirage-2.1.1.ebuild 1363 SHA256 3ddfd2e5a1a97c5a372c7db74febc9f0685ff01f3a6c070bb103d5beeb9f9d5e SHA512 e770733566b965b82ce082cff23d7074c533ef7f0f61e3517bb45154ea785a9a106e5f1bcb4eb87f4f1f4ecfb0af155be2760af46a300d71160f83a0eea8bc30 WHIRLPOOL d3da51f90fa1e5a3a920149aefce0d40bde6b9d10d07a9d4272626cba5a33a7bfd18955f0c5ba2cf7d00fec18501ddef96676ea46b93a29dff38f6a0293b690f
+MISC ChangeLog 6295 SHA256 321bd6332f33f2120ad434031052186c671634e79a2e2acb479646baa0d6a9da SHA512 cd32915f9c8d7624bc22a9a5956c9d8ef4c6030a9df0923dbb7ea68209fb4176fbf407202abfe1a47e1aa7b330a244c03b577d8c552df2d6e7de49c2dbe9da46 WHIRLPOOL 462fb9dbc7ae5db6006717776f69615d1521ef508c0c8a8a745b4f585f90561d9b56e4c420d93f76878ef9db07e4e7291a3281b22ffa95f2e82f7856cb24c0a1
 MISC metadata.xml 240 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477 SHA512 14c9405275f11667ad7e035376fe7e5caf99ac982596621cda18a2f8a99e9a9b2464806be5d016d1a4c2fa794bf8b1400a5cb658a7a874e65d825b8baea69d62 WHIRLPOOL 0e2fbd97c0146322cf226d3086acf3e95dc86d17409f3d350ba2de1b81a2d93b0dc3f370d5c444475e129fa511791ea5b48ca00c47583cedc6ed60ef9e61fae7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR6nBIAAoJELp701BxlEWfE7oP/AhO3Xq2KKQcgpaubaWhluBr
-VQ/pVWB5ajmXy3SJUwwJLuXVtSI1j1Ie4uLReRNLmP/lNoEHm6zSbk4J1kKJMLjK
-/BZYUmuQ7zciJPGiU4loUoIJ7I+UbiQXBnKR5U0z3Il0KQ+5roylGyqliW8639Xb
-n9gi9pjfUwDfrIW39sYOb5UiPNzckm0XD94E/OWkW6nNlKaYWDrQbDuNqn2CUw02
-Ukdj2+sNbwFE/PW5MotSQc3HTxPbBDBXirnLS1wzN6D8a+3Baitq53wTmR8VzgHU
-t/a4UpZ/pWifqs5XvGYZM8ya1IU/YlDSu6dRDjRSrwzzIg+0vgwMeUX16S3FWWQd
-OI29yrd1kDf/RjfGaion1PBy+AgUxAhCp2JnM1tPhbmsRLUMfIRWsXeW+lZ+8ORc
-9oBvVlmGnw3+y1cwZKf2PWfK/WIezkHK5yq9IEPomD1+wy09xXNQ6TS0tHIcE7oP
-4aMVUFPa2gW87TgkVTa7zjfyFi11/ukpjSWCjqaCbDkw4uEX4AgWE9hoDdTaEIGI
-hE1MjPya5mV3Q8t2NI3FgeycRBVyCgK6eiRVLHDyIfIzGPS3Zr74e7sO3UJMVlye
-q7RZ43EF5nnhlqM3HwabBpKjz4tBDeJ9JiYrtYcM/TUFg7FzqfeADJ6WVtaEnTQi
-p3IBisuwCbB+UpdFRr7d
-=97pM
+iQEcBAEBCAAGBQJSVDghAAoJEJ0WA1zPCt1hMpsIAI0mSwM5RtgjUxa1qA8aHvWI
+jJNARNfk0XyIZGIMBpuX+KM6tva2yd9fAxmPNXu37a+oxVPIH51hODnQEgP14NKs
+ozTRSIOI4zGh+UuDainWy7GlpvOGeK+72n4WzapaPxWtLD1O6fOM/YjPfzqX6Noy
+x4T8wpfi6I10DxU/vZRCIYAXo4lpnLncArik3J+r7QCpHg1t3fZRUaQRxVZlmmvm
+nEBd9O84jvHNsY+hXJlUF23hvqoOCBTDrXsmhTskEdvCvmEdcfQ5N2omaeg88dv+
+V6ZcSPypwDQIFhtCFdaO5U+1GrFGVNCPnmD/miD1Ysss8D6DZCuIxMQsVZzda34=
+=K1Ox
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libmirage/libmirage-2.1.0.ebuild b/dev-libs/libmirage/libmirage-2.1.0.ebuild
index 6d738a6d73ee..99ca0720893a 100644
--- a/dev-libs/libmirage/libmirage-2.1.0.ebuild
+++ b/dev-libs/libmirage/libmirage-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-2.1.0.ebuild,v 1.3 2013/07/20 11:11:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-2.1.0.ebuild,v 1.4 2013/10/08 16:51:45 tetromino Exp $
 
 EAPI="5"
 
@@ -38,6 +38,7 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use doc GTKDOC_ENABLED)
 		$(cmake-utils_use introspection INTROSPECTION_ENABLED)
+		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-libs/libmirage/libmirage-2.0.0.ebuild b/dev-libs/libmirage/libmirage-2.1.1.ebuild
index 720cc1e437d8..50dd60228211 100644
--- a/dev-libs/libmirage/libmirage-2.0.0.ebuild
+++ b/dev-libs/libmirage/libmirage-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-2.0.0.ebuild,v 1.5 2013/06/25 16:56:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-2.1.1.ebuild,v 1.1 2013/10/08 16:51:45 tetromino Exp $
 
 EAPI="5"
 
@@ -13,13 +13,14 @@ HOMEPAGE="http://cdemu.org"
 SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-SLOT="0/7" # subslot = libmirage soname version
-KEYWORDS="amd64 ~hppa x86"
+SLOT="0/9" # subslot = libmirage soname version
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc +introspection"
 
 RDEPEND=">=app-arch/bzip2-1:=
 	>=app-arch/xz-utils-5:=
 	>=dev-libs/glib-2.24:2
+	>=media-libs/libsamplerate-0.1:=
 	>=media-libs/libsndfile-1.0:=
 	sys-libs/zlib:=
 	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
@@ -28,26 +29,15 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
-pkg_pretend() {
-	check_compiler
-}
-
-pkg_setup() {
-	check_compiler
-}
-
 src_prepare() {
-	# Make sure gtk-doc and gobject-introspection are optional
-	# https://sourceforge.net/p/cdemu/patches/16/
-	epatch "${FILESDIR}/${PN}-2.0.0-gtk-doc.patch"
-
-	sed -e 's/-DG_DISABLE_DEPRECATED//' -i CMakeLists.txt || die
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use doc GTKDOC_ENABLED)
 		$(cmake-utils_use introspection INTROSPECTION_ENABLED)
+		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
 	)
 	cmake-utils_src_configure
 }
@@ -65,12 +55,3 @@ pkg_postinst() {
 pkg_postrm() {
 	fdo-mime_mime_database_update
 }
-
-check_compiler() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	local v=$(gcc-version)
-	[[ ${v} ]] && ! version_is_at_least 4.6 "${v}" &&
-		die "${P} requires gcc-4.6 or higher to build. Please install a recent
-version of sys-devel/gcc, and set it as the system compiler using gcc-config"
-}