Revision bump, EAPI 2 and slot change to :3.5, remove old

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 68 insertions, 47 deletions

diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog
index 9fd45e22e911..fff2b085083d 100644
--- a/app-cdr/k9copy/ChangeLog
+++ b/app-cdr/k9copy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k9copy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.46 2009/04/06 11:53:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.47 2009/05/25 01:24:26 tampakrap Exp $
+
+*k9copy-1.2.4-r1 (25 May 2009)
+
+  25 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -k9copy-1.2.3-r2.ebuild, +k9copy-1.2.4-r1.ebuild:
+  Revision bump, EAPI 2 and slot change to :3.5, remove old
 
 *k9copy-2.3.1 (06 Apr 2009)
 
diff --git a/app-cdr/k9copy/Manifest b/app-cdr/k9copy/Manifest
index 2073c1075655..0499b66917f5 100644
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@@ -1,11 +1,10 @@
 AUX k9copy-1.2.3-desktop-entry-2.diff 689 RMD160 90594426be3e2513d7e96762eb9bec173935d2b9 SHA1 df11b6287b3fa677c5de5ce61546c23d4a92b162 SHA256 8ccde406a59469196c6623bb02d51f867288ce2dd769518acc1acb6732859bfd
 AUX k9copy-1.2.3-gcc43.patch 769 RMD160 2711f9a8f988ab4906715794319b134055519bf7 SHA1 122d4a9c1a0c8163b76351a7551a87639247f1c1 SHA256 f098660456973036229b2f9932704161f2aae028208283c7701d5e7b6952d49d
 AUX k9copy-1.2.3-new-ffmpeg.patch 721 RMD160 5b4613fac2037ef016adc8e5695f448f2bacad1f SHA1 17dc97c89341897841bb5bb03cafe667ac9fe5aa SHA256 74532727580a339a0aff2f6286e755aac673841efa9f264f9abff0a74c6fc406
-DIST k9copy-1.2.3.tar.gz 2810070 RMD160 2c1bf0cf09bf45d412c8a9e061c86ebec11ca34c SHA1 b69e5e9571db2f02f6f50698380556c5619bb62a SHA256 22d9359217a72842166f8db80f5fc6644ef9ebfc036c956356c92d2d68dec9bf
 DIST k9copy-1.2.4.tar.gz 2554245 RMD160 cc97694241ab8cd93dafc897d895876e3c01f1a5 SHA1 169073a8c99535277d2d549b93cffe3f586682d8 SHA256 f5aab0947e2fe20b8adf4a95d907ab0d2846ddb85cca5fb755c3178b09b7edac
 DIST k9copy-2.3.1-Source.tar.gz 1482231 RMD160 8792f5b8d78a39807a05e79d5215f02acf950f9f SHA1 70c6bab324024d0c9c575b8a00006724a9429d98 SHA256 4530fda6b36525cf7ece8b4994cdf5db839a6ca55489a815d9f1f47a6739ec76
-EBUILD k9copy-1.2.3-r2.ebuild 1185 RMD160 694a04721fb423d06f5ed94f6dca05bbeeedf183 SHA1 12168d3f7e4730434b34f22780cb17aa797a2e6c SHA256 fa1c69936637a70a9e9dfd1c698426517b9c9f443265eb0bf4402d0a129ae6d4
+EBUILD k9copy-1.2.4-r1.ebuild 1295 RMD160 8b6d46da9b9c4e80c636209c6d360b838f32bd2a SHA1 ff5ed1855db8e6db3589d00e6e0071a66bd0c49d SHA256 7aacfa9935c13b309fd46e9761626ad6490967a71def20fa7b7a227fa023e2b8
 EBUILD k9copy-1.2.4.ebuild 1559 RMD160 8c2736fa9d747497cf924cb9f4f3d7be601e0ca1 SHA1 153c8ad0dd2d70790e2d9af98f4f86c60927c2ae SHA256 e88518624686174af71708cdb8fbbc3042e041f64f77e9f495a61f1a8b731279
 EBUILD k9copy-2.3.1.ebuild 983 RMD160 7ae1c9a6bcda6fdd00fc0d2edb65e997e589ee5b SHA1 9d268683d14fa17c9bf86f12fdaa48bab13cb7e1 SHA256 8f65e812af8dca36c087e2ac7a90a1ef4c11d999a85185fb29f0e5fa7cc3d141
-MISC ChangeLog 7823 RMD160 a2caee37073c3e6508ab342d86a3213033334e41 SHA1 9f8f1eeff2e19c198666d067be648ecb42fc9deb SHA256 3262f0765736ec855d236f90503657af3e98744f6fd4c419a1ec13188147a26b
+MISC ChangeLog 8024 RMD160 922ff72bafd0d3971afda3080cc0f9994a9faeb9 SHA1 c80778162ab0e1196bd1131b4fbc6d22ceaaacfe SHA256 8f631e4a6bf477bf4362ff35f0c69ef665d4a4a67e62b3b720a2f962031b4885
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
diff --git a/app-cdr/k9copy/k9copy-1.2.3-r2.ebuild b/app-cdr/k9copy/k9copy-1.2.3-r2.ebuild
deleted file mode 100644
index 1a3d906b8c01..000000000000
--- a/app-cdr/k9copy/k9copy-1.2.3-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-1.2.3-r2.ebuild,v 1.2 2008/10/04 19:28:21 keytoaster Exp $
-
-EAPI="1"
-
-ARTS_REQUIRED="never"
-
-inherit kde
-
-MY_P="${P/_p/-}"
-S="${WORKDIR}/${MY_P}"
-
-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/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="media-libs/libdvdread
-	>=app-cdr/k3b-0.12.10
-	dev-libs/dbus-qt3-old
-	sys-apps/hal
-	>=media-video/ffmpeg-0.4.9_p20080326
-	media-video/mplayer"
-RDEPEND="${DEPEND}
-	media-video/dvdauthor"
-need-kde 3.5
-
-PATCHES=(	"${FILESDIR}"/${P}-desktop-entry-2.diff
-		"${FILESDIR}"/${P}-gcc43.patch
-		"${FILESDIR}"/${P}-new-ffmpeg.patch	)
-
-pkg_setup() {
-	kde_pkg_setup
-
-	if ! built_with_use x11-libs/qt:3 opengl ; then
-		eerror "K9Copy needs Qt 3 built with OpenGL support. Please set the"
-		eerror "\"opengl\" use flag and run \"emerge --oneshot x11-libs/qt:3\""
-		die "Please follow the above error message."
-	fi
-}
diff --git a/app-cdr/k9copy/k9copy-1.2.4-r1.ebuild b/app-cdr/k9copy/k9copy-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..6890aac54003
--- /dev/null
+++ b/app-cdr/k9copy/k9copy-1.2.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-1.2.4-r1.ebuild,v 1.1 2009/05/25 01:24:26 tampakrap Exp $
+
+EAPI="2"
+
+LANGS="ca cs de el es_AR fr it nl pl pt_BR ru sr tr zh_TW"
+
+ARTS_REQUIRED="never"
+
+USE_KEG_PACKAGING="1"
+
+inherit kde
+
+MY_P="${P/_p/-}"
+S="${WORKDIR}/${MY_P}"
+
+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/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="3.5"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="!<app-cdr/k9copy-1.2.4-r1
+	app-cdr/k3b:3.5
+	media-libs/libdvdread
+	dev-libs/dbus-qt3-old
+	>=media-video/ffmpeg-0.4.9_p20081014
+	media-video/mplayer
+	x11-libs/qt:3[opengl]"
+
+RDEPEND="${DEPEND}
+	media-video/dvdauthor"
+
+need-kde 3.5
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.3-desktop-entry-2.diff" )
+
+src_prepare() {
+	kde_src_prepare
+
+	local MAKE_LANGS
+	cd "${WORKDIR}/${P}/po"
+	for X in ${LANGS} ; do
+		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}.po"
+	done
+	sed -i -e "s:POFILES =.*:POFILES = ${MAKE_LANGS}:" Makefile.am
+
+	rm -f "${S}"/configure
+}
+
+src_configure() {
+	local myconf="--enable-k3bdevices"
+
+	kde_src_configure
+}