4 files changed, 14 insertions, 84 deletions
diff --git a/app-cdr/cdemu/ChangeLog b/app-cdr/cdemu/ChangeLog
index 46d6e861224f..7110f1927798 100644
--- a/app-cdr/cdemu/ChangeLog
+++ b/app-cdr/cdemu/ChangeLog
@@ -1,6 +1,10 @@
 # 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.40 2013/06/25 16:56:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.41 2013/06/29 04:07:43 tetromino Exp $
+
+  29 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -cdemu-1.5.0.ebuild,
+  -files/cdemu-1.5.0-man-paragraph.patch:
+  Remove old.
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> cdemu-2.0.0.ebuild:
   Stable for amd64, wrt bug #473538
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index e60b0b5f9c56..be297de8e779 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,30 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX cdemu-1.5.0-man-paragraph.patch 952 SHA256 7b533de5f4a198a15bfe9908057baa8f02952be5e29dd2ceb9a5b9d690e70236 SHA512 0d9ab97c97a3dd93e7b7bc1f684f0c1c263b4e61e92ce8beb2e97e9dda16f18b5107d58660605172d9d521c9f2789f039604bb33e9e75baf0ed654cc17ce5558 WHIRLPOOL 4476a93929812b99863124a0bad6f9c5edde076760c1784e5310a4cbd9c6298e0c0a66710d71003cc26d7ac3c01742887b5ae0692c92a0eb5e457187a6b0b5bd
 AUX cdemu-2.0.0-bash-completion-dir.patch 392 SHA256 507efb0d806f15b398d9c9473beedf7063b3faa8a453e2eb52384d353f40ccbc SHA512 c508bc0b7a4f6af34d17907938fc769f523e2cb9f8455d038ffcc29b046f489fbff0be0ba1ab30e374f48f682647790a5a85d0bc8ca6f0348476e47cf4e8883c WHIRLPOOL 024a54cfcc10cb4b72e747164391eb4ba46da5f38cb986a3781eba19ab35d8175b634dfe26ddf0cfdc9ac23dc04c9ef9ed29d50b0f4714934cb0d3b419d90971
-DIST cdemu-client-1.5.0.tar.bz2 97987 SHA256 d4d7e3d232f799830c1c480d69f8789468552602e2737b0b0207f4d449095f99 SHA512 42e43e3a0fb240107c2500d1d4b3f9ed1e1df352c768e6b9ecb019a03f561a4a086df0ae16c744cb22e86db4ed1d3aed1a4171c4e881b89920b9897e6e41cdfd WHIRLPOOL ddf8908f2e80971206d8402fcd1ad0884ffe74314eecefa445359907b7fc94d08ea251250ea825cbc0e589eb691439d3a50e680b2c901e0604966806b011aeab
 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-1.5.0.ebuild 1107 SHA256 89369a4c0f4d02d03058dd4192a43aed159ed77d36f9739c69c3cbdf524fec97 SHA512 37588694f4dae28bfa8f467c841d372f3a7e2218283af5d77b9e8ae99cce4ea7386c6c10af1fd42d3ad65fdda53d94e3ac24422a32531df63e0b693dd8d11d6d WHIRLPOOL 524b6251daff63f63ffe234019548aa391db531cba8c66916ab8ed22f75a11249691b3719e65f8db6f2caee4f2332f89b4edaf443c68741a455166b06ad9e3f4
 EBUILD cdemu-2.0.0.ebuild 1346 SHA256 c767aa9feed533eeb6257f31329f830310a8c83bf8d6d3084b63cb10978a6c30 SHA512 d1a02ac936561a67e70397348bee91e8e9a85810e2baa499bc63f6b7f9722a32d7068f6bbf99a9a186248d81b8fff96349f35d57a9269a46aeb8f7fbceab33de WHIRLPOOL 76498f6ac04dbb061966423c58c1672539f27e642049b37ac2a36d86a5cc7682e45542bc1f838101902961e66ae244a8dc59c0f3f5e8d4f9b93dec82db15bae7
 EBUILD cdemu-2.1.0.ebuild 1394 SHA256 14ce81a0af738a49f745bc8506199b210231d6b6a6f263dd1b2f44efd1541e99 SHA512 af9b60e09fdf914f06b9b9f0d4ad196696c626f1428d80ed3628aa0e1d5860858753e253f1274ad93a067670213c90a4c21b98bcc630ee7b87119e8304bd0e13 WHIRLPOOL 772d0b369968a7b9182dd0047dcad894ddb4df68833564eeb22d49aac3314b06943decb405070998570b6a4fc3a24c4b18cc1b83e2b01f2a829cce0dc30ba113
-MISC ChangeLog 6131 SHA256 b5cdecc7079d7a743a3ca33db5b57167b6564b633a311eac6ff842d91c317052 SHA512 70d834fa7b867c2e7490540930bd6d8d06ff4509aa7fcb9b4190457e3bec5dbafc204450a49982fd4d32f6dbef9f164df81d649790d28888b6e5bdbac7832683 WHIRLPOOL e1b055d5cfb4c3bf944e9b05ce365acf942dbe5edcb0d60784ed0456be104a83a6ef7c9bc998c201656da8be354012e9d488f97172502e53e7bff19f8852acdc
+MISC ChangeLog 6274 SHA256 60847fcd423f864eb5c95c373025e6a0174f2e23aa152baef7ee226ab3b63389 SHA512 32d8e377179c1e2493aebd7e69c13554f8947e44df09b2254e77b25357c7f06f7b18a2b29b37a31b05d5747606a39fcdd748b3ef69e595e1dace8b5c1edf9f81 WHIRLPOOL 26694a7f1dfbd350b54436ffed139ba4ca62ec160384b6c6710d23502d4ae87836214668e14dd594698c9f627e79355900d6b7791ad58c38b3551ad41413ade3
 MISC metadata.xml 431 SHA256 48171f5b68cda683ad7bad2680218da9430ed068dbe441d86d5639dd9c9c3c07 SHA512 c62007c25bd76a0a5673e29e1c391d48c6d6f83e84a6fa30fc6bc7fac2d1924139fbd463f0025779bec87d0359cd28dcdb4d6df2778d5f0035b7811845da2900 WHIRLPOOL d86cb4f30b390600d7eae7c82783961a1e22d33d9459a99a7afe5eb49c42797b30a19b9a054f7f0b7cb415f427c6973b73fcfbc5e571af84d07aa06e8234fe82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRycuvAAoJELp701BxlEWfe2cP/3vuRws9vj1gy3y8Pk/ad8AF
-zu2A6UvPGNWcFc0SsNwmPI+JjzIXbSzDBB7lSURY+Ic4mvqqJ2G84yqGNLk5DhME
-IRhnNds313WVhWVQCF5LcjB9IRFAVtdO5D9uRn+yodqf0MT8sXgV39dKwTnkYFu5
-bgHc6OpFmOZLNZ+M0Be6yPnR89oBPWAab/FtQWlKScSs4l4NM8TF/bFwd0w8vGgM
-nUCK6KQVBcj/nluBDsYndhOufoYrqcvYr+jemfAG4Hqj6ytjH0rFAkJfECCJeY2/
-n3ERzzlXOL0R/QYf7gcYcAiDYXzV0qncJZej1S4AuzdVDVl7Vs1Qsli1RNee1gDa
-okAtaJ1SQ0czIPj5oF0SN9Gi1n3Ej2Lzo14w9xgtti80ROkFeRal40SYAKFqLhOV
-SjVmqUu6AnXavMGdMgYi9iAnHFdvGEaoqNkprklWrTAZ+uvlz8w/V1RLhgKR+Kaq
-w3bLdTKc3dringObv9lWnuAVPzfxj9mlJUVU8bXhWD15VZg2rY6LprXhupIQB2x2
-cvIO+PgG+rjOrQParVs92QugKWSOblIAN2nsuBblNBbmmRoRtUZPQfYdf1h8MDRb
-EWxtYmoikX5fTWkE1u2EsdFb4v5cwQgI7pO8PJ2RwPbcwsJo4wJumC6zJ7tdq5F1
-BRzBELw2AdDhOiGyjJRD
-=+nZb
+iQEcBAEBCAAGBQJRzl2QAAoJEJ0WA1zPCt1hjPIH/2pjWukKgtEXBu+BftYPgndh
+w1cuEPNzQec//jBoQXrZzg5Dpk+9viEBjO8TS9R2vli3aDDMUjso6YeAr6kdDf2k
+QugqGrGRArcupW+eFw5AM2n/g0aoZGS1seNozSp2xI0KQSJpCEN1uAV3Odx8nsxv
+mz2bX7ahRW/xfYX12XB1Xmx8uUxGjqNByKkGEeW0EhBXN/uFFt11CoFFqiKjKPYm
+47IPFAnt/rgmo4dmi5/ZKVHJqgD2U4ENRBegfajh6Cu8G/jzJ/47YW5LL1thgOY7
+98DAHYtge0xNAp5W8GbaxewQYwWt3Omzx9p+q8E822AkpsdRTkzgBJlOwfiD7jc=
+=Iljk
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdemu/cdemu-1.5.0.ebuild b/app-cdr/cdemu/cdemu-1.5.0.ebuild
deleted file mode 100644
index c7ab47357af5..000000000000
--- a/app-cdr/cdemu/cdemu-1.5.0.ebuild
+++ /dev/null
@@ -1,41 +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-1.5.0.ebuild,v 1.6 2013/01/28 00:22:41 tetromino Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit eutils python
-
-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="dev-python/dbus-python
-	cdemu-daemon? ( ~app-cdr/cdemu-daemon-${PV} )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 src
-	# https://sourceforge.net/tracker/?func=detail&aid=3477103&group_id=93175&atid=603423
-	epatch "${FILESDIR}/${P}-man-paragraph.patch"
-}
-
-src_install() {
-	# Don't install into /etc/bash_completion.d/
-	MAKEOPTS="${MAKEOPTS} bashcompdir=/usr/share/bash-completion" default
-	mv "${ED}"/usr/share/bash-completion/cdemu{-bashcomp,} || die
-}
diff --git a/app-cdr/cdemu/files/cdemu-1.5.0-man-paragraph.patch b/app-cdr/cdemu/files/cdemu-1.5.0-man-paragraph.patch
deleted file mode 100644
index 559fcb9e9be0..000000000000
--- a/app-cdr/cdemu/files/cdemu-1.5.0-man-paragraph.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ead7336eac14a4dc8f8bce842a13d59b806aa934 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 21 Jan 2012 17:02:42 -0500
-Subject: [PATCH] cdemu-client: missing paragraph break in man page
-
----
- cdemu-client/man/cdemu.1 |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/cdemu-client/man/cdemu.1 b/cdemu-client/man/cdemu.1
-index 1c5dfdf..31fcb5a 100644
---- a/cdemu-client/man/cdemu.1
-+++ b/cdemu-client/man/cdemu.1
-@@ -57,6 +57,7 @@ the client will prompt for it using standard input without echo.
- Allows an encoding for text-based image format (such as CUE) to be specified. This
- might be needed if the image descriptor file contains non-ASCII characters and does
- not use Unicode.
-+.TP
- .B --dvd-report-css <true/false>
- Mark the DVD image as CSS-encrypted. This influences the generation of fake
- Disc Structure 0x01, and as such works only with images of DVD videos that do
--- 
-1.7.8.4
-