amd64 stable wrt #310385

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

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 54d208c34848818a3bf9db08fd8485d5dcbf8d3b..94eafc28d8a616444f1f9302a45e033719d3e824 100644 (file)
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.106 2010/03/24 19:16:33 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.107 2010/04/05 20:15:15 ssuominen Exp $
+
+  05 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  kaffeine-1.0_pre3.ebuild:
+  amd64 stable wrt #310385
 
   24 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
   kaffeine-1.0_pre3.ebuild:

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 79eb4f2445b0933b317eb254f9ad1c219022677a..5cac8c56a8a85378d4b8176a8b5d8eddc537f00d 100644 (file)
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST kaffeine-1.0-pre2.tar.gz 272825 RMD160 990b609474a1c50b6edcab0d53adf90baa36097f SHA1 12aa280d449f20668eda8e9ed4c5d5f3f410f136 SHA256 5612f3e81aac971a7695fcab68735770cadadfed0f64c494a0eafb0e8741faa2
 DIST kaffeine-1.0-pre3.tar.gz 337369 RMD160 18a72d13381a0cc77563489c5a9201b376b9f53a SHA1 9e97c00f596124633213251559e83d989b6f6ad1 SHA256 8b2c4bb08c9f2d85bf430b39c91a4305f34123ca2b42db618bf6aa50cb6361ca
-EBUILD kaffeine-1.0_pre2.ebuild 904 RMD160 a2bc1d10ac6225d3bcf0f8d9cd6ee040b4c8de21 SHA1 7e605f4839e47c01c464da34185ea7b1ce3945e1 SHA256 da8d452d6910d3e628ae914cdb0a52612506b54481e092175d6a5326e2971be6
-EBUILD kaffeine-1.0_pre3.ebuild 934 RMD160 1b66f86935711ccd5fe9f482d045743b3dcde3e8 SHA1 8678f7c0e2213f352535f97f8550b290f33a8a32 SHA256 d9da89678286bc87a1353b4614d2e607561a52a73742cf7cf556eecf4baeecbb
-MISC ChangeLog 16303 RMD160 31fdf85e56ba05ee27f7c5fd8303621cc05362f1 SHA1 59a629e53eda41ab2a2da5926a250b3bbddd9909 SHA256 d09c6f812b8977ff5624b415eb5febf93fc66814b9890048540066466a70f471
+EBUILD kaffeine-1.0_pre3.ebuild 937 RMD160 ffbb4014dd752a23b4a61b9112ed18c5c24c90f8 SHA1 379411e1aa9a4daf009b207aeb6da74a238d938d SHA256 da2f35bc4a65d930bc32c3003b6aba5d012ba9af1456dd04799440e2913962d9
+MISC ChangeLog 16417 RMD160 817955aa6a5c3d74db64a54e5a5cc7205504b57a SHA1 09d556eda0ad0de16bb6a96fcb1ea720257761f6 SHA256 3f040e7fe0fd7478ad2d8d6e8a43d2155657c1933a8f0452ca478f7584c89f28
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuqZRcACgkQNQqtfCuFneMMywCfelvNcbPFhyz3nJ02/2bdIiiw
-GP8AnRuzKNbowDtVKNe0TjXxMR1xrMB6
-=Ja5w
------END PGP SIGNATURE-----

diff --git a/media-video/kaffeine/kaffeine-1.0_pre2.ebuild b/media-video/kaffeine/kaffeine-1.0_pre2.ebuild
deleted file mode 100644 (file)
index a36f9a2..0000000
--- a/media-video/kaffeine/kaffeine-1.0_pre2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.0_pre2.ebuild,v 1.4 2009/11/09 17:01:50 ssuominen Exp $
-
-EAPI=2
-KDE_LINGUAS="cs da de el en_GB es et fi fr ga gl hu it ja km ko ku lt mai nb nds
-nl nn pa pl pt pt_BR ro ru se sk sv th tr uk zh_CN zh_TW"
-MY_P=${P/_/-}
-
-inherit kde4-base
-
-DESCRIPTION="A media player for KDE with digital TV support"
-HOMEPAGE="http://kaffeine.kde.org/"
-SRC_URI="mirror://sourceforge/kaffeine/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug"
-
-DEPEND=">=kde-base/phonon-kde-${KDE_MINIMAL}
-       >=kde-base/solid-${KDE_MINIMAL}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS Changelog NOTES TODO"
-
-src_configure() {
-       mycmakeargs="${mycmakeargs}
-               $(cmake-utils_use_build debug DEBUG_MODULE)"
-       kde4-base_src_configure
-}

diff --git a/media-video/kaffeine/kaffeine-1.0_pre3.ebuild b/media-video/kaffeine/kaffeine-1.0_pre3.ebuild
index 00979a21e4d603584a8fb03e0c3a366ab9553d94..2ab07e5178675d9f7ff468980001a32e445a35a6 100644 (file)
--- a/media-video/kaffeine/kaffeine-1.0_pre3.ebuild
+++ b/media-video/kaffeine/kaffeine-1.0_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.0_pre3.ebuild,v 1.2 2010/03/24 19:16:33 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.0_pre3.ebuild,v 1.3 2010/04/05 20:15:15 ssuominen Exp $
 
 EAPI=2
 KDE_LINGUAS="ast be ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/kaffeine/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="debug"
 
 DEPEND="x11-libs/qt-sql:4[sqlite]