Version bump, remove old.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 32 insertions, 40 deletions

diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog
index bd515e7dfc11..263bc356561d 100644
--- a/app-cdr/k9copy/ChangeLog
+++ b/app-cdr/k9copy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k9copy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.68 2011/12/07 07:43:26 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.69 2012/01/12 16:05:44 johu Exp $
+
+*k9copy-2.3.8 (12 Jan 2012)
+
+  12 Jan 2012; Johannes Huber <johu@gentoo.org> +k9copy-2.3.8.ebuild,
+  -files/k9copy-2.3.6-return.patch, -k9copy-2.3.6.ebuild:
+  Version bump, remove old.
 
   07 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> k9copy-2.3.7.ebuild:
   x86 stable wrt bug #391611
diff --git a/app-cdr/k9copy/Manifest b/app-cdr/k9copy/Manifest
index f275ff6b1a75..ccaac12a0d1e 100644
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX k9copy-2.3.6-return.patch 205 RMD160 9a734c1bc0ee9b4a69d0a1c84c0e338d4c473b52 SHA1 efc9d53f6cc67543a007e9aa78d85e880fb0b216 SHA256 4563523438fb290f37c569411e2d9cb8838280996cc9df5214701e7658598903
 AUX k9copy-2.3.7-ffmpeg.patch 664 RMD160 fad7bd83cf932edb13ce2a5b332dda90d8943c64 SHA1 d9be05d7a362ad95fcf584ce22611e18d06a136d SHA256 76c0e7f4e29ef41ecc7948f1a81eaabd41f00fcc520401d9943c24e70a301d58
-DIST k9copy-2.3.6-Source.tar.gz 1562476 RMD160 c61a2f3802b50fd99058f448f1687d7bbd543267 SHA1 e0399b42a8dc8b9ea5b0bb332a1e2d7bfa18e104 SHA256 d2ebbb6ee72b8e6b3e7daf62746442e8e3a2edb54603333a418d7da753045436
 DIST k9copy-2.3.7-Source.tar.gz 1571305 RMD160 c3b57c77bdb32365f9f694101f1eaf59059d22d9 SHA1 8b0aa8f1e63e4a396746f88ca9c763808895b7d0 SHA256 516f4108a189a050f0aadf5b617d151b6b0e52c18823941f2b895073c104e74e
-EBUILD k9copy-2.3.6.ebuild 1196 RMD160 fcf9ee408d2ce61e17b2df5bf9dc90898a9b95f7 SHA1 9a8402fe50ffbc1ef7cf4bd75c46558ec56b02a1 SHA256 efc2d82e8e6fb50499b2ce62d100ca1f9728e2a23ba8311f373aa942c705f1fc
+DIST k9copy-2.3.8-Source.tar.gz 1589535 RMD160 1855649ca84140718fc26d97a79ee23e8eb90fa2 SHA1 15c9900c689d4d98d8ebae9fbe6e7f7de158cc32 SHA256 cf5e2d9faf7821561e478ed1fc9b63bbcc3448405d7b7866f68b018d16b42fdf
 EBUILD k9copy-2.3.7.ebuild 1197 RMD160 da157fea1f327f2cc5932615f92f68007f37d1b6 SHA1 0f1b421c66c96b998bc6a5f5cc9d79a70e362fc9 SHA256 3d5de4af5f25483b7d01a3af9e28653d20cdb1773807e484d41848ff76007753
-MISC ChangeLog 10841 RMD160 418eb7ee05d4dc85895806e9296b5fa920cc0794 SHA1 acba3a801fbe563ec77fa4d89aff77592ea520a3 SHA256 57aa6efaee7dc0bb8a6508a31ac073c3a642d5b848f9d94c2f12b0228a30c13c
+EBUILD k9copy-2.3.8.ebuild 1171 RMD160 36e9142c3eb344b950cef64d564ce8a69c933de7 SHA1 d71c3d826d3a9cdde854fb6c17e1985e3521a1a2 SHA256 5422f83318de212a77a0b640dc578d3dc48e11bfc25978c99707adad89fc950b
+MISC ChangeLog 11021 RMD160 c4572f6cca9919f9bed7eb0dd608680298c374ee SHA1 eea16cc29abdc3691f341e4d72c360af08044dd8 SHA256 e2491601a46f5aae4cc5117e29e9e15a5a3ebc0bc7de878334d8cc5095734059
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7fGSUACgkQuUQtlDBCeQJ01QCeMQVc1f+yiwhzUzs1s37TFZRA
-CjgAnRvLrRilAlOdBadRymXQoXgALUzd
-=xLlt
+iQEcBAEBCgAGBQJPDwSxAAoJEO+t9ga+3I3aoI0IALEHr+PszNCT+2Yp1wXfNN3n
+UOchjFTDxdyqlyqyFvP81bd0AFso7qCQ5rcCyk6GR4blHGq76FAsS4FQ+KnPV/xZ
+r/Pw9Q1+b0SVZvUtGm3A4BfVNsX9Q86e119pEm6tnupMTIzspi3F8DQduooKBwUp
+ik1AEWCBWvIWZ180adhVPom7Q6iyzynuSiVsqgnL7TmIgcyb1x+Dkt71DZ9XqVn2
+97VbaI/QVqqx6N2YoFxwZjrDAR/3O0CRXpb30Ad7RbNG7Xh4iis6gY6Alhkyc2Wu
+yupHhSe4gpDstddALIVWNlSk4J+DxuZMLfzP3cbhrvM6hnPdGC0hHDzgDgCrAhE=
+=Bnoa
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/k9copy/files/k9copy-2.3.6-return.patch b/app-cdr/k9copy/files/k9copy-2.3.6-return.patch
deleted file mode 100644
index 86316f30936e..000000000000
--- a/app-cdr/k9copy/files/k9copy-2.3.6-return.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kde4/src/mpeg2/kdecmpeg2.cpp	2009/11/23 21:58:43	450
-+++ kde4/src/mpeg2/kdecmpeg2.cpp	2011/02/06 20:41:08	561
-@@ -286,6 +286,7 @@
- 	      }
-     	}
-     }
-+    return 0;
- }
- 
- void kDecMPEG2::sync() {
diff --git a/app-cdr/k9copy/k9copy-2.3.6.ebuild b/app-cdr/k9copy/k9copy-2.3.8.ebuild
index 36faad57f23c..acba02f288bc 100644
--- a/app-cdr/k9copy/k9copy-2.3.6.ebuild
+++ b/app-cdr/k9copy/k9copy-2.3.8.ebuild
@@ -1,37 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.6.ebuild,v 1.7 2011/11/29 22:00:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.8.ebuild,v 1.1 2012/01/12 16:05:44 johu Exp $
 
-EAPI=3
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ca cs da de el es_AR es fr it ja nl pl pt_BR ru sr@Latn sr tr zh_TW"
-
-	MY_P=${P}-Source
-
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-	S=${WORKDIR}/${MY_P}
-else
-	ESVN_REPO_URI="https://k9copy.svn.sourceforge.net/svnroot/k9copy/kde4"
-	ESVN_PROJECT="k9copy"
-fi
+EAPI=4
 
+KDE_DOC_DIRS="doc"
 KDE_HANDBOOK="optional"
+KDE_LINGUAS="ca cs da de el es es_AR fr it ja nl pl pt_BR ru sr sr@Latn tr uk zh_TW"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+MY_P=${P}-Source
 
 inherit kde4-base
 
+ESVN_REPO_URI="https://k9copy.svn.sourceforge.net/svnroot/k9copy/kde4"
+ESVN_PROJECT="k9copy"
 DESCRIPTION="k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5."
 HOMEPAGE="http://k9copy.sourceforge.net/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
 	media-libs/libdvdread
-	>=media-libs/libmpeg2-0.5.1
+	media-libs/libmpeg2
 	media-libs/xine-lib
 	virtual/ffmpeg
 "
@@ -39,10 +33,9 @@ RDEPEND="${DEPEND}
 	media-video/dvdauthor
 	media-video/mplayer
 "
-
 DOCS=( README )
 
-PATCHES=( "${FILESDIR}/${P}-return.patch" )
+S=${WORKDIR}/${MY_P}
 
 pkg_postinst() {
 	kde4-base_pkg_postinst