Stable on ppc. Remove older. Wrt bug#428338.

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

4 files changed, 22 insertions, 116 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 07cc2e4dc73e..e0bd4aed7e63 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/ktorrent
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.185 2012/09/04 22:16:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.186 2012/09/20 11:57:37 scarabeus Exp $
+
+  20 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> -ktorrent-4.2.0.ebuild,
+  ktorrent-4.2.1.ebuild:
+  Stable on ppc. Remove older. Wrt bug#428338.
 
 *ktorrent-4.3.0 (04 Sep 2012)
 
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index a2250400912a..28c81574cc62 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ktorrent-4.2.0.tar.bz2 3083219 SHA256 f625b1dc116c94d97ce3b56a7a259b07d95f6592b709596319bf16bb06cf6422 SHA512 248b70e537059092ced1cf408586df40feb10be4e4fe6aee5b18bdf046c42eff008c65628423728c98f9000eab1ea24942085576231827de5c209406f2d590b8 WHIRLPOOL 7251bfbd891a41a4b5c17f1eda8de24196ce497e6050107d5f6b9903722383fe99075845775fb6cdaf5107d43033d233ba5e4e5e57cba9b2d055e5fb984161dd
 DIST ktorrent-4.2.1.tar.bz2 3082436 SHA256 ed8ff3ad627c50ffd44f2b6d8ae8cd46aa0d4359bbd3ec13a715e1bd433cdcac SHA512 933fac0f69d06bb4d2e4bf25ec716a0988d5f36b42399679672dd2a58648d4cc7ac547b41ad21dcb96c04e14a694f121d9f702c53ccb6fd2e02198c12570452e WHIRLPOOL 85c8a8f4e5fba00c95e3fc5d9e21d55cb16ca576b04f0d3daf353a6c4619b277066bdc61d11d89568c842239566fb47e08b069dd85d9f9c84dbd18bb2c2839f0
 DIST ktorrent-4.3.0.tar.bz2 2983013 SHA256 6e3a7d12d351cad0e40b87562556f07ce9ee1378048f99073c6bac7b971483ed SHA512 45886353b8f7d96c151e8da94d1409b01d2c8e0960aa8c0eebcf43ce4426089c53aa736607f3e1e124960999bb23634b38a55146bd2d9224a22981cfbfd577a1 WHIRLPOOL a83a18608e38123b9f8012950f24085d896c5fb3b68267366069fd0d834804a05401509f0d8b398dfa99b2ad45743dc25d9e1b52a59d4042b6a568835ab12522
-EBUILD ktorrent-4.2.0.ebuild 3175 SHA256 fa52efb5f024c1f05c7e02fb19119a8439e0d62123f442bce8489fb7340de1bd SHA512 1b23eb2ff5abb947732f931064041b7fb405b5a06afd1a4fa4a4e5173cd142a8ff36e2696cd8a2dd1d31a8edc84f60db2b0e8e44672185d24a5211b968c7265c WHIRLPOOL 612b5dec0d59b54a60676ec715e302f5073a86d8fad06cb5c8c25fbe754b8463b3014a46439ba2f8090ff14027d3d60bb0521868da7d25a8cb520298bc23c82f
-EBUILD ktorrent-4.2.1.ebuild 3176 SHA256 7ef3c31965ff3c72a372ae53cf3ad450072bd0955b85b3843fcc50b6b716bc7f SHA512 53d941495ed476532700a382a0c3b05eb2a615255933b88a91a3befcc1fa840656665ca14157a97d6267b34f28082a1f44cfb7512f05f110455aac8da4691333 WHIRLPOOL c9d8b9bddfd598bd334cc5cb49374df877de3e5306d1ad69b6cc05702f997d6a7b19e61cd44100aec157110f2e4a65083232a7ad64c1003c72dc494f46cfece2
+EBUILD ktorrent-4.2.1.ebuild 3181 SHA256 60b80359857e460bfd20847ddb9cd522d1258c6ef3b7762069ccea53a7c76ed3 SHA512 19ea9f08f40f2d36cf56035382c68d0c8000a1f95a103e3bcf4578730ce0e79c1888840b6009122550969bd6429b8ac590a9ba8236c7bed184768c3058f54ad6 WHIRLPOOL 19eba8f0d3af788ab688eed33122378ef04f452f381affc97a91cdf26c196303b35da7ea0d28189ffc9fe1e5596ec51d82468c3b6decb1138a1d97e88aa6f6c8
 EBUILD ktorrent-4.3.0.ebuild 3173 SHA256 cdf518393868c7e506ef5b27ad5e8dfc82668ec482d0eaed7026ac4243905036 SHA512 48e3bb4cabe870b2f9c11672e56f56a40267e8c9ffed7c9bb629d85d45dfc01278b7412c1fca007b02baeb6623034d2b8f10bf221f3d65827586e5b47bc821b5 WHIRLPOOL 33c01d927b8150a7f0ce168c40fdddcf8467115ec0a4ebe958ed28f4ba07246f49a72ea875af9cf7b1e2fe60b486e7c0da7bbddf82211c7dac101b04878f63fd
-MISC ChangeLog 27255 SHA256 814adb539eca73fb1a36c75599dbbadac1bcf49b300d79097aa93ee9967a0188 SHA512 febcad543c9435cd87d20df5f6cd3ec0803e252a080a4c95538ec4e9026089a65cb36fbd11c8b8ec1cb1680c98a152c9fa4e2fdd6c80d1f9b86d37aac000d497 WHIRLPOOL 8e51fd947f2ec0482642625c3671ef0c2dbab21255f8cadbc7698ba47194bfa76c78b4f9d3ae2a54bc5682fb0b2e7702a33f1b2c5a2650786876e096e6453a11
+MISC ChangeLog 27412 SHA256 add7a157bf77bf4d9883decb267d5dc4cddd0c4c44f1d5ab2089d51771efa9f3 SHA512 1553ce0fe7dca99a1beb144de58e2ca27c09cb02aca07650c8fc2900d2ce9fb81362dbad4e5c2e6ced348043892b1d2ad9c5a5be752f827cc3370267e4e3ba48 WHIRLPOOL 1590087172f62c25141b04af591446f1bcb1e891583f852bfe4703927d0a70b3d6c9617f4b73b59a67bb19ec980bf2ad338a611b71eed9005b1779217bcea45c
 MISC metadata.xml 1389 SHA256 e7fa6c95c77618daa38c5baf4c97621eb7cdb7b38e38f9f81f30804d77097cf7 SHA512 c67868c32860317a59291822b32ac567eee88498eb79fb48c0b8ec8cbceef1ab957ca441f75731b22e9649b865e39ed7f9a01153affabfac3bdaac3865be2486 WHIRLPOOL af37a7f15e775ef53be3946ff3603ad4bdeeb7690b04eb25d72af2184f3f7f50ae48b63272b15bbee50db2f7b5629c3fc6753322c3044feadace6ceced353d28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQRn3eAAoJEO+t9ga+3I3aI7kH/i8g7d3KD0DN+AkQaNdyQUPK
-9k+LPUpGuShgFz8M3BYHET90cssSqYIrJ/FKqLsoZYDfJfgawzKrGDV8ircF+COO
-wwIx50U10ilUCq9JQYDpFcx/72Bek3SG/HfVH952ZI4tYGk6Q6VGZet9LnMOgbju
-6anRPe/+9GiqoM6INnnz5HKoSuEjF5RpJGo30PGBRg4cf8gwqEjRu5fuSwS55ROA
-X6nI9e8t9nqbe61wOtwuJoHT5iMHAxfjl/3pizXu3eqoJNA5To3Pli8EY2DaSBDL
-iaa3DgKiLsxkgKDPl4VilEsMV4sQ2vUleN/hhe5Wfis0YHpdrpTKQ4g3SGPL1Fs=
-=IUKa
+iQIcBAEBCAAGBQJQWwSbAAoJEOSiRoyO7jvoFV4QAJkYjrWvFzRiknin/EYSkoZV
+ll8yqf3Mn9o47zzcWTIT3QoIH3alv5nBYxqazN5uKJ/+YV3LWTeYA+gyfTZKaDQ6
+rOyOgTlcEA/vXiodUzeUOF6cSe7oU3yxPRqCOGpwGDrhpNpuIXxjTEdYgHFmQzWw
+jRzMkitam/Q/aHzssWcf9UOjnGWDotV1B3KBAX3BalpQiWxXakqFOnqG3By4mZds
+6imPW4aPhdaguAM/dc2TT2AV8MvYtFuX5w0MB1tPO6h0qcMrDPHMnBn8kbhDZL/L
+qy/x9StrUdP68LhCK2+1bRmNMz8hBjf2F+WeUusBWxUq6nyi5yM1PNlDlA27Ravv
+iKMux3XPgG1aEGwEZbtE4s/BCdSKV62r2tfzQwTP5UkF4VeZ9wz+Y6VkXzlMjWTa
+WmHZDYE8xIO9Tww0aHml6W8QkOwds3BZZqdx4kBye7sL6lXfLkKeW+rAQUeGo5JN
+5QB9i0qRZxrVOx38JJntm+FGmQFHj6y4dn5cSs7BGJCHqNbW37fGeJY+cAKvSolj
+H+XEAPMc0mbf1jtOZlOWHFXFTrZt6E2TljFVUPXOzijQ+Tew0Ede5zxcAXGn6Bsl
+wOQbuSU7WSgPcuypxwg6B+xL2yy0qeM4BR3VVZ+90hCrHsbhVMoOSmI0IW9a+qcc
+0CTWXL/EH4L13DofdIzi
+=2AJj
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/ktorrent/ktorrent-4.2.0.ebuild b/net-p2p/ktorrent/ktorrent-4.2.0.ebuild
deleted file mode 100644
index af3c6b11f8d9..000000000000
--- a/net-p2p/ktorrent/ktorrent-4.2.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-4.2.0.ebuild,v 1.4 2012/07/11 01:04:30 xmw Exp $
-
-EAPI=4
-
-KDE_SCM="git"
-KDE_MINIMAL="4.5"
-LIBKT_VERSION_MIN="${PV}"
-LIBKT_VERSION_MAX="99999999"
-if [[ ${PV} != 9999* ]]; then
-	inherit versionator
-	# upstream likes to skip that _ in beta releases
-	MY_PV="${PV/_/}"
-	LIBKT_VERSION_MIN=$(($(get_major_version)-3)).$(get_version_component_range 2-3 ${PV})
-	LIBKT_VERSION_MAX=$(($(get_major_version)-3)).$(($(get_version_component_range 2)+1))
-	MY_P="${PN}-${MY_PV}"
-	KDE_HANDBOOK="optional"
-	KDE_DOC_DIRS="doc"
-
-	KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et eu
-		fi fr ga gl hi hne hr hu is it ja km lt lv mai ms nb nds nl nn oc
-		pl pt pt_BR ro ru se si sk sl sr sr@ijekavian sr@ijekavianlatin
-		sr@latin sv tr uk zh_CN zh_TW"
-	SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.bz2"
-	S="${WORKDIR}"/"${MY_P}"
-
-	KEYWORDS="amd64 ppc ~ppc64 x86"
-else
-	LIBKT_VERSION_MIN="${PV}"
-	LIBKT_VERSION_MAX="99999999"
-	KEYWORDS=""
-fi
-
-inherit kde4-base
-
-DESCRIPTION="A BitTorrent program for KDE."
-HOMEPAGE="http://ktorrent.org/"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer
-+magnetgenerator +mediaplayer plasma rss +scanfolder +search +shutdown +stats
-+upnp webinterface +zeroconf"
-
-COMMONDEPEND="
-	<net-libs/libktorrent-${LIBKT_VERSION_MAX}
-	>=net-libs/libktorrent-${LIBKT_VERSION_MIN}
-	infowidget? ( dev-libs/geoip )
-	mediaplayer? ( >=media-libs/taglib-1.5 )
-	plasma? ( $(add_kdebase_dep libtaskmanager) )
-	rss? ( $(add_kdebase_dep kdepimlibs) )
-	shutdown? (
-		$(add_kdebase_dep libkworkspace)
-		$(add_kdebase_dep solid)
-	)
-"
-DEPEND="${COMMONDEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-"
-RDEPEND="${COMMONDEPEND}
-	ipfilter? (
-		app-arch/bzip2
-		app-arch/unzip
-		$(add_kdebase_dep kdebase-kioslaves)
-	)
-	kross? ( $(add_kdebase_dep krosspython) )
-"
-
-src_prepare() {
-	if ! use plasma; then
-		sed -i \
-			-e "s:add_subdirectory(plasma):#nada:g" \
-			CMakeLists.txt || die "Failed to make plasmoid optional"
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable bwscheduler BWSCHEDULER_PLUGIN)
-		$(cmake-utils_use_enable downloadorder DOWNLOADORDER_PLUGIN)
-		$(cmake-utils_use_enable infowidget INFOWIDGET_PLUGIN)
-		$(cmake-utils_use_with infowidget SYSTEM_GEOIP)
-		$(cmake-utils_use_enable ipfilter IPFILTER_PLUGIN)
-		$(cmake-utils_use_enable kross SCRIPTING_PLUGIN)
-		$(cmake-utils_use_enable logviewer LOGVIEWER_PLUGIN)
-		$(cmake-utils_use_enable magnetgenerator MAGNETGENERATOR_PLUGIN)
-		$(cmake-utils_use_enable mediaplayer MEDIAPLAYER_PLUGIN)
-		$(cmake-utils_use_enable rss SYNDICATION_PLUGIN)
-		$(cmake-utils_use_enable scanfolder SCANFOLDER_PLUGIN)
-		$(cmake-utils_use_enable search SEARCH_PLUGIN)
-		$(cmake-utils_use_enable shutdown SHUTDOWN_PLUGIN)
-		$(cmake-utils_use_enable stats STATS_PLUGIN)
-		$(cmake-utils_use_enable upnp UPNP_PLUGIN)
-		$(cmake-utils_use_enable webinterface WEBINTERFACE_PLUGIN)
-		$(cmake-utils_use_enable zeroconf ZEROCONF_PLUGIN)
-	)
-	kde4-base_src_configure
-}
diff --git a/net-p2p/ktorrent/ktorrent-4.2.1.ebuild b/net-p2p/ktorrent/ktorrent-4.2.1.ebuild
index d19705f829b3..9bc0366c5f12 100644
--- a/net-p2p/ktorrent/ktorrent-4.2.1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-4.2.1.ebuild,v 1.3 2012/08/05 20:57:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-4.2.1.ebuild,v 1.4 2012/09/20 11:57:37 scarabeus Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ if [[ ${PV} != 9999* ]]; then
 	SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.bz2"
 	S="${WORKDIR}"/"${MY_P}"
 
-	KEYWORDS="amd64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ppc ~ppc64 x86"
 else
 	LIBKT_VERSION_MIN="${PV}"
 	LIBKT_VERSION_MAX="99999999"