Version bump. Remove old.

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

5 files changed, 32 insertions, 97 deletions

diff --git a/app-cdr/cdemu/ChangeLog b/app-cdr/cdemu/ChangeLog
index c672fe4cf133..79a65ba139c1 100644
--- a/app-cdr/cdemu/ChangeLog
+++ b/app-cdr/cdemu/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-cdr/cdemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.45 2013/07/20 11:11:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.46 2013/10/08 16:52:20 tetromino Exp $
+
+*cdemu-2.1.1 (08 Oct 2013)
+
+  08 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -cdemu-2.0.0.ebuild,
+  -cdemu-2.1.0.ebuild, +cdemu-2.1.1.ebuild,
+  -files/cdemu-2.0.0-bash-completion-dir.patch:
+  Version bump. Remove old.
+
+  08 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -cdemu-2.0.0.ebuild,
+  -cdemu-2.1.0.ebuild, -files/cdemu-2.0.0-bash-completion-dir.patch:
+  Remove old.
 
   20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cdemu-2.1.0-r2.ebuild:
   Stable for x86, wrt bug #477004
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 9138bb777761..fb7f74d27119 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,29 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX cdemu-2.0.0-bash-completion-dir.patch 392 SHA256 507efb0d806f15b398d9c9473beedf7063b3faa8a453e2eb52384d353f40ccbc SHA512 c508bc0b7a4f6af34d17907938fc769f523e2cb9f8455d038ffcc29b046f489fbff0be0ba1ab30e374f48f682647790a5a85d0bc8ca6f0348476e47cf4e8883c WHIRLPOOL 024a54cfcc10cb4b72e747164391eb4ba46da5f38cb986a3781eba19ab35d8175b634dfe26ddf0cfdc9ac23dc04c9ef9ed29d50b0f4714934cb0d3b419d90971
 AUX cdemu-2.1.0-bash-completion-dir.patch 467 SHA256 992d3c5abf786c7385235424dc82dc46b3b29f25a5c0319bf30eaad0fff7d0de SHA512 3d363b34749c60dddbcd8bf3b861ca91650915cc79df194c1a00dfe309b53b2a73a62d25545d1b57b0d8d62137fb09006e03b6e5f3784fd6c925de99f7b8b9fc WHIRLPOOL e18cb21f05b243fbb5717ea7e7e4cde37a52359b5e9d45be1b0060df9fd653b7733665706b9fc030819a373b4f80dec7ceefa461766a1045b2cc4ba12d497156
-DIST cdemu-client-2.0.0.tar.bz2 28346 SHA256 a049df0d97b46bedf8604123c9ac6207f6b506855da6c379550513cb40e45603 SHA512 c510087a3c2a343beb99f4a02c9db0407ee4a27fb640af5343fac081aab10afa616ce3477fc2baf7aefbcde12b2de0c80e330be33e82ed7f60cf6eb3b03f854f WHIRLPOOL 1e3843d3ce6dab95726f563ea385e9a091055585f537b57942b2e51a547b342369c7577bf55f63a75fa378f95300c1eeaf8c00be0a42a04384654a13bff42fae
 DIST cdemu-client-2.1.0.tar.bz2 28173 SHA256 9bd0448368b5e51eb2acfe420f612f67e3b3d4aae4aa80fa36ce130fa0a10c9f SHA512 bc02e3fb6df10702ee9e710ad8a881c92b5462015d19152fe784778a9106a4c2ef03d0e2a23850a742cdf3242e1f81350ce8cdf89671681104dd4cfa85a48d3a WHIRLPOOL 0da8a25919144cd57696934fce0c42618f3d04bff315e7e55f319785e72a27fea954ebf05a7e7120919b9741f1b65a2193663bcef29982acf6b04c4a2e10f37d
-EBUILD cdemu-2.0.0.ebuild 1346 SHA256 c767aa9feed533eeb6257f31329f830310a8c83bf8d6d3084b63cb10978a6c30 SHA512 d1a02ac936561a67e70397348bee91e8e9a85810e2baa499bc63f6b7f9722a32d7068f6bbf99a9a186248d81b8fff96349f35d57a9269a46aeb8f7fbceab33de WHIRLPOOL 76498f6ac04dbb061966423c58c1672539f27e642049b37ac2a36d86a5cc7682e45542bc1f838101902961e66ae244a8dc59c0f3f5e8d4f9b93dec82db15bae7
+DIST cdemu-client-2.1.1.tar.bz2 28474 SHA256 204e626994f61d36423f3b732e180e3b3b20624effdfe91aabffd439c76d3964 SHA512 d764000fadc66b639dd8f20d9bb8fbe3b91d3e20bd207d30a734dc1a9a7fae746e8aad317a3d78cd35b69d0a8acbf8e389598786cadabec6e512640ba5b21be5 WHIRLPOOL 93cb01c3bc16ee69e3fd9ce9080838f4eebc874afe8d6be71c22e44919909144980dd44595a0dbf6fe1add3574061bcd6f523b72644eb52774d974f226c100b9
 EBUILD cdemu-2.1.0-r2.ebuild 1455 SHA256 2b0ab524bf6aca8d4adcc5250e81e9731a1a8882a311326b2a624427324a5cfd SHA512 e5f95b4c5172c36b4c832c9feea9695507a9c0cba3df628cd1914ca5f0dcee10ce197c53d4d20b36b5e1e2f9aa7c9d16f022bdf2fec1950c9503e2bbeaff3928 WHIRLPOOL cb5d560daff9f722dd956d2c7e0b4955d91c246081ae51adecda92fa2c1e95f3d0c819977f557eaf21e1ee58f4813b73cf10ad7d1da68754bb385ba6638ec94b
-EBUILD cdemu-2.1.0.ebuild 1394 SHA256 14ce81a0af738a49f745bc8506199b210231d6b6a6f263dd1b2f44efd1541e99 SHA512 af9b60e09fdf914f06b9b9f0d4ad196696c626f1428d80ed3628aa0e1d5860858753e253f1274ad93a067670213c90a4c21b98bcc630ee7b87119e8304bd0e13 WHIRLPOOL 772d0b369968a7b9182dd0047dcad894ddb4df68833564eeb22d49aac3314b06943decb405070998570b6a4fc3a24c4b18cc1b83e2b01f2a829cce0dc30ba113
-MISC ChangeLog 7070 SHA256 359e1f81097d8a66fe3578e814058b3a8d918735fec0e3a941fa19ce397d7b78 SHA512 04ab49f9e58e85ed7f0c33816d5d3e1c7279515781d2739ba2f18126b16260fc263c3fe865899adc6f251c0775d8ecdf223985f697808f4a0dcbddbed308ad6f WHIRLPOOL 9dbd4ac7889b3dabec38335c87a03fec2a1fe71619abe0736b14ded16c36e48b90b8c783b072d28b2e91ac1d6630b56886fbae1bfcb10e72fcc69003f585a09d
+EBUILD cdemu-2.1.1.ebuild 1460 SHA256 1511608d884639975f2b538ea021db84c6e46a14fec550a110bd7b982960ee5c SHA512 ff86656fb76d72c8b53b551a301c20028e2a43e7ba76344ade7ca5a3e6193499811896ed9c83cd52bc9df69076071214332b3ff5cab1ea0173bf2e6ae89868d8 WHIRLPOOL 8c433952a32963b121a15a4965ac7ea2d51c3930e0ff004b274fe1f04a820cde00792492a5113c8e1b8ff30e79fd4ca3a1eb67578e63db028959fd106fa803f3
+MISC ChangeLog 7469 SHA256 448610172189dd2c4a7deba4137752d77e452d30b3fa3cf03426daf1e16f99cb SHA512 60880dbebf2cb5fc858b6f7c38175d130942462197c8ca719ffc94a6913b8d93205766504eec67e45116500767ad132dba569dd87b18b5bae811a97ab85469b5 WHIRLPOOL eec1091e32f19fa03c4b6c5a7e25e0161a30bf87cc87723e9678105dee6ee4364ba3893c2358ebebb37a95532d847ecdb6f4e3664d83291285835c05b24a8ddf
 MISC metadata.xml 431 SHA256 48171f5b68cda683ad7bad2680218da9430ed068dbe441d86d5639dd9c9c3c07 SHA512 c62007c25bd76a0a5673e29e1c391d48c6d6f83e84a6fa30fc6bc7fac2d1924139fbd463f0025779bec87d0359cd28dcdb4d6df2778d5f0035b7811845da2900 WHIRLPOOL d86cb4f30b390600d7eae7c82783961a1e22d33d9459a99a7afe5eb49c42797b30a19b9a054f7f0b7cb415f427c6973b73fcfbc5e571af84d07aa06e8234fe82
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR6nBQAAoJELp701BxlEWfWkcP/3u+eEY5uviPuMf73yny0/aU
-mif+RoD3dqAS/OFbMG5OOXYPAOaIZtLtd5OgXnHDlbydzWAR8tPMkZK4uSvOAuEw
-Gxu/ucfKdMObhe7oHiFrdgF3zr/Cs8bUH9RNLskyl4FTSslWsYz9GknfZ9IpKfe2
-q408VzOHh0jzBPWMtqVZreJFvjrmObSDOb7DmCop4+ZCnn+Te+AcW/VRRNNeh3Vz
-gZoKwsDvp3KXLbdRkRaznM7fs+VmKWgkSB4NZ+CK7pfAAFkZrkcD81/5MuLgAxPj
-R2C6URwXCzAbD9clf+iO10BVILL8ruwuxdaKtz1HW+9GqRTgDE0SRlT4sKydSsxY
-7W4WiWvzK5W7sBuYnuHwY4nWyONM4Iimm3QkJjO9IY/RSx1OcRh/9jtcHkTOwTKV
-l7R4RFWQijCQMx/dY7HR2keiQ5pd2YEYP1sJYyS9n7BG81bZbIxSBqv/XVItvkxv
-UctaQYWN9O5KKwjAFGFnobMhCGbQeOhQEwWbGkVpCepxoY4RDaU6EXYHc6B9LrO1
-F+QfJwbScpZXXFJ4pgauzApW+W09yJAqIdPJTPGAhdB0Zx1f3Dt6Ke2Oc39jnqRi
-P/2Q/ClYpAPY4HP5xVqGWnkAWxW0s5wKKpJ0TUAnTmDWZwQW9HuEdsJDIw7Kfocm
-Sav5L0FS0/eco7i7EaHp
-=tZO3
+iQEcBAEBCAAGBQJSVDhDAAoJEJ0WA1zPCt1hCr4IAJgk8oVHWVxx1GAH7EoGGvH7
+3x3WMNH0ekh+zdipWgsgEqRlu1fYGwzlv0gVotzump70S/81+u1RCSokHeyReNA+
+/Qp+8u+JWXLyGwgokVtMEIFFKZ4JpXimBmv4bKCpTdYAxVobyFyya2kNLFaLHWPN
+5/cQYgHVaudWcDK+F+Irb9u/qSrN7oLHfkW9b7EDv3YrAXYYrGXxFsuVvH3s0eYs
+76znsZeliv2/6cWFAoh3N8W5kzSe0YBAYHdbda9IR6ef4jaY4/F3kmKc/aPzIQ3H
+936USkZj+KBkqQmu+Kdx/qwDIATr7iYsyVZXWNRjxkPwqUgEivYxk59NXxWnC2o=
+=5IMC
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdemu/cdemu-2.0.0.ebuild b/app-cdr/cdemu/cdemu-2.0.0.ebuild
deleted file mode 100644
index c9632ec1cb89..000000000000
--- a/app-cdr/cdemu/cdemu-2.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.0.0.ebuild,v 1.3 2013/06/25 16:56:14 ago Exp $
-
-EAPI="5"
-
-CMAKE_MIN_VERSION="2.8.5"
-PYTHON_COMPAT=( python2_6 python2_7 )
-PLOCALES="de fr no pl sl sv"
-
-inherit cmake-utils eutils fdo-mime l10n python-single-r1
-
-DESCRIPTION="Command-line tool for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="+cdemu-daemon"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	cdemu-daemon? ( app-cdr/cdemu-daemon:0/4 )"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	>=sys-devel/gettext-0.18"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang src/cdemu
-	epatch "${FILESDIR}/${PN}-2.0.0-bash-completion-dir.patch"
-	# build system doesn't respect LINGUAS :/
-	rm_po() {
-		rm po/$1.po || die
-	}
-	l10n_for_each_disabled_locale_do rm_po
-}
-
-src_configure() {
-	DOCS="AUTHORS README"
-	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-cdr/cdemu/cdemu-2.1.0.ebuild b/app-cdr/cdemu/cdemu-2.1.1.ebuild
index 438b827b2bef..51262d57a6d0 100644
--- a/app-cdr/cdemu/cdemu-2.1.0.ebuild
+++ b/app-cdr/cdemu/cdemu-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/app-cdr/cdemu/cdemu-2.1.0.ebuild,v 1.1 2013/06/17 04:19:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.1.ebuild,v 1.1 2013/10/08 16:52:20 tetromino Exp $
 
 EAPI="5"
 
@@ -8,7 +8,7 @@ CMAKE_MIN_VERSION="2.8.5"
 PYTHON_COMPAT=( python2_6 python2_7 )
 PLOCALES="de fr no pl sl sv"
 
-inherit cmake-utils eutils fdo-mime l10n python-single-r1
+inherit bash-completion-r1 cmake-utils eutils fdo-mime l10n python-single-r1
 
 DESCRIPTION="Command-line tool for controlling cdemu-daemon"
 HOMEPAGE="http://cdemu.org"
@@ -21,7 +21,7 @@ IUSE="+cdemu-daemon"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	cdemu-daemon? ( app-cdr/cdemu-daemon:0/5 )"
+	cdemu-daemon? ( app-cdr/cdemu-daemon:0/6 )"
 DEPEND="${RDEPEND}
 	dev-util/desktop-file-utils
 	>=dev-util/intltool-0.21
@@ -35,7 +35,7 @@ pkg_setup() {
 
 src_prepare() {
 	python_fix_shebang src/cdemu
-	epatch "${FILESDIR}/${PN}-2.0.0-bash-completion-dir.patch"
+	epatch "${FILESDIR}/${PN}-2.1.0-bash-completion-dir.patch"
 	# build system doesn't respect LINGUAS :/
 	l10n_find_plocales_changes po "" ".po"
 	rm_po() {
@@ -46,7 +46,10 @@ src_prepare() {
 
 src_configure() {
 	DOCS="AUTHORS README"
-	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+	local mycmakeargs=(
+		-DPOST_INSTALL_HOOKS=OFF
+		-DGENTOO_BASHCOMPDIR="$(get_bashcompdir)"
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/app-cdr/cdemu/files/cdemu-2.0.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-2.0.0-bash-completion-dir.patch
deleted file mode 100644
index 58ad6d9f24eb..000000000000
--- a/app-cdr/cdemu/files/cdemu-2.0.0-bash-completion-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
-index 6f33b7c..5261c18 100644
---- a/cdemu-client/CMakeLists.txt
-+++ b/cdemu-client/CMakeLists.txt
-@@ -41,7 +41,7 @@ install (
- 
- install (
-     FILES data/cdemu-bashcomp
--    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
-+    DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion
-     RENAME cdemu-client
- )
-