Version bump. Remove old.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 29 insertions, 74 deletions

diff --git a/www-client/rekonq/ChangeLog b/www-client/rekonq/ChangeLog
index d42cea0a3812..ec67852bf842 100644
--- a/www-client/rekonq/ChangeLog
+++ b/www-client/rekonq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/rekonq
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/ChangeLog,v 1.56 2013/01/27 16:18:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/ChangeLog,v 1.57 2013/01/28 15:57:41 kensington Exp $
+
+*rekonq-2.1 (28 Jan 2013)
+
+  28 Jan 2013; Michael Palimaka <kensington@gentoo.org> +rekonq-2.1.ebuild,
+  -rekonq-1.2.ebuild, -rekonq-1.3.ebuild:
+  Version bump. Remove old.
 
   27 Jan 2013; Agostino Sarubbo <ago@gentoo.org> rekonq-2.0.ebuild:
   Stable for x86, wrt bug #450678
diff --git a/www-client/rekonq/Manifest b/www-client/rekonq/Manifest
index c183345c0e2f..6137d4c51fdf 100644
--- a/www-client/rekonq/Manifest
+++ b/www-client/rekonq/Manifest
@@ -1,8 +1,20 @@
-DIST rekonq-1.2.tar.bz2 3822223 SHA256 c7f77c349e5c8857ee246d8e55f5470250a543c4e4a287bae7cfd338bf4a2ef1 SHA512 3384c41bda75068862004e46414379ad9941fb0755a5d9277ae5ab117fa12e3ce715350d6d69e7d8a0ea9387f0f5a1635304753b46268f5b6f208d11c16e1498 WHIRLPOOL f58d0406d01726e61fad9d4ea88844cd42717735ed41ca25612725764a523edea7f2e76438165a0dbd6dccdf4f45f95f133771f5b01e682c168cd9960827cde5
-DIST rekonq-1.3.tar.bz2 4459861 SHA256 8db67e674b3dd013a6511f9612829f958ca95a2d515f89fb999f5568bfed7ffb SHA512 a67d4cae4c1b3bb5b4f775d431454a0374d1835c75903215050a937ec3193558d31a876d62d7ccb0373454145612678d5f7256beb84a13a61cb118f01588c938 WHIRLPOOL 457381a4ef5673a02e08240901848095e8b814cade726e6ce78753b0c5a5598d3e3118fea4e8adbf1e74c9447ca8a48289a13012348b9f992c08767191c9b000
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST rekonq-2.0.tar.bz2 4393897 SHA256 380aa337b561ee0c5eb1aa8401f7bd8d98a2b18e645e92f3387baae06d501d84 SHA512 935372d7d6b8502e7bbdd4c9c341dd53d07db8f5c67a5cddcf678920883efe08c38493baa5c0038346b9d30b7ac190a5e62eeaae0db0713e641106bd342491d4 WHIRLPOOL 3728f97091b778ab504e2b5a54c0cc14e44d2f80b73c83beb15299793a4496d899f362a8e1ed08632b335d676f9eb8db2c0f082229dc46eaba31a1bdedca32bc
-EBUILD rekonq-1.2.ebuild 1511 SHA256 20ed96677bd7d0c09155071a0a610a988294879ad0329c1c404a94761d5526e0 SHA512 54e053b267b673f803a353d934701a14ede9254da183c0bdd6724fa5104c1e24a96681c20d35af2ff4d8a4c2c2b0b9c2923d4a2708a7ef271e0efe2e1e08e19e WHIRLPOOL a9da197b065ddacae03f515fff76322911fa8022134ccca090e0e2f05dd16895992349525f88ff8f3f7d3beea435dab82963a31a89105a87b655726f17326005
-EBUILD rekonq-1.3.ebuild 1484 SHA256 d62d9ad134b4cef68dac5f3a9b1de012525e168606ee24a7958df53dea82fd88 SHA512 f7cd9a33179725045b6198deaba64db2ae966bff95aca20f0c6a7455caabff7ca6937be395f1af8dee1d6bf855ee399b213f35bd6abb79fa9c2f28b03e2b913d WHIRLPOOL 9b8e13a1ec7dc06395acd900966df629e4420a77e2fb04ed638cc1d334fde4364b8a4c1441339b973d64975323b1cd409ccc0e97cad646d427afa74a68e1ad17
+DIST rekonq-2.1.tar.bz2 4272774 SHA256 92640c80b19e88934d5ed618b4a61c767ee7a27e4792e43bd3ccf51a7b5ce664 SHA512 87cbde439c11de17e18f4f9fdc3c157dec1bc923324c3fa9ead7215dc7be2225363fd6df1e638f70ba0a39d3b489acf4f0f938c7ea6ae888f21265bf151ef3e8 WHIRLPOOL 142506c4e4732e8300438099859a6d6c1d5f2d85c1a0e97979b6808108d1a8ed26c3a34fa368def39e505b6c8c60d0b228a51c183b4f639685fd7b694d4f71a7
 EBUILD rekonq-2.0.ebuild 1414 SHA256 8215db37fa11b69736c73bb4eb082fef0566d3a5061c665a86e778d06ea48cb4 SHA512 c1b2b1ab1a9015d7faac669d2ae0791b24079c3c95f4176cbfe8b00c6e9259fdea28987ffbc443901f33a839f0ad4bf00c97b2cf16da0e40d8a1011e3efa6d09 WHIRLPOOL fa4c4bf9b4d0f35e0da0b5d7e296b7705119cd5339cee4273852989ac23d0530b3c48c94108fc8dd8dded3950cad3dc4b11b5a4736480632226a0ae4266d4348
-MISC ChangeLog 7731 SHA256 0537311a27ee568cd907b41f1c9746401c5e390e9eb0426f843e7d7c6814bcf7 SHA512 cd10447e0b22c9093e47f97b6f78b70f80b4b6ce9e0cc0e9c9efd0bc647d1f8490a75796e52a3786c5e3762155d63a107d9abd9e5fa60616725e96497552ad9b WHIRLPOOL 9483e8a0a050cedfdbb5664db46107793112813bc13766f7244d93b40957c42adc4df4c234ba6340edcc7f56f4e08ffbb28802ec52b55a9dc4d1f563e9a6a20f
+EBUILD rekonq-2.1.ebuild 1318 SHA256 05c8cf000c0d5194f0045a2850803de2ca33a068fbde39fa96f5b68fd2d43754 SHA512 db2456b486106eb34f1df6c48d680595ba6bb2fee09dda6dc43704c95b3d141fc66755278ecad6bec214639cc07b8aabdec7db8cf1fd7bfb1ecbed9ee1707e79 WHIRLPOOL b4353680c663942a35d1041b3b72dc34d5524aeddd2a96df26c345de86ae5f1c12ea89f186d81dfea65d10c23c448a870d75b3832a48b96d6b44226d0700d141
+MISC ChangeLog 7912 SHA256 b2a490a74645adc2937b36151d39400f4385a2ac6935a867c2d55cc141fab42b SHA512 618f784d5780f9ad58858f70e3108b8c9f4407f8087ce9514d24b4514e86a4ce2310e1ae90e53a28bb045a6270e3ec646a250a476fdedf47dcf0f6ea8056a3c8 WHIRLPOOL a3bac290a2734c0b81edb76429c01e3e812210b3ed38e660a6fcdbd08da4740308ead5fec66c9b9f230858a07bc381edd5764dcf1bca8b25dde8b2e4289b84f2
 MISC metadata.xml 231 SHA256 f9f444905a2f663487ceae58056706bc3dae4e109278dca8938332e7a2ccfecb SHA512 d6f870b273ef83dcebd0e3793cac21b76dd9e84ecd3ba5e08f931c9e699089d4eb2ccc6bcb5da2f33fc87ed67865529d8b7556d59ee81d84a2c046fe926ba871 WHIRLPOOL 36f074fd17b7bde8813c6e1c10cc2f6a61efc59c381843320f71434f5cc49ccedba619795a45fa86cc1e29323c4f83da7a8b8820ccfd20d470780f6e4d885ad6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRBp8pAAoJEMbwO6tnXQ0s5w8IAMsb64wxS/ZX3Ngkf7kodVsQ
+GD6NDeg9KPoLkZt3Tyu0c7CGkk3FW92GtkRAJ8YThZuYC7hRecfpf4lS4mUez3xN
+Wr53hGXNUOMIQW3lMtN4K/4/tVD63UDUsEmT7t8uot+JRI9Kcbwem8nsw9GJY7s/
+yMMcRXJaROBsAzi6O9xpT48gPwwlAkZGL75I55hoI6S74qEHLik2tjveWU1Xeuxl
+4JUWeu2ldqB92+HofEb9YgWNHH/TerbLUAAvNFxcvt5gjafvXV5ucqghTwFZQWHO
+rP+IpKFPNjnTw9WCwNJshHlGryppvCS9bTyxhwslmVDP+gbGIlHCZHLedGGlULw=
+=oB55
+-----END PGP SIGNATURE-----
diff --git a/www-client/rekonq/rekonq-1.2.ebuild b/www-client/rekonq/rekonq-1.2.ebuild
deleted file mode 100644
index 6157ce9e0b1d..000000000000
--- a/www-client/rekonq/rekonq-1.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/rekonq-1.2.ebuild,v 1.3 2012/11/23 19:39:30 ago Exp $
-
-EAPI=4
-
-WEBKIT_REQUIRED="always"
-QT_MINIMAL="4.8"
-KDE_MINIMAL="4.7"
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
-hu is it ja km ko lt nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED=test
-inherit kde4-base
-
-DESCRIPTION="A browser based on qt-webkit"
-HOMEPAGE="http://rekonq.kde.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug opera semantic-desktop"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	>=x11-libs/qt-dbus-${QT_MINIMAL}:4
-	opera? (
-		app-crypt/qca:2
-		dev-libs/qoauth
-	)
-"
-RDEPEND="${DEPEND}"
-
-# Almost all test fails
-RESTRICT="test"
-
-src_prepare() {
-	# KDE_LINGUAS is also used to install appropriate handbooks
-	# since there is no en_US 'translation', it cannot be added
-	# hence making this impossible to install
-	mv doc/en_US doc/en || die "doc move failed"
-	sed -i -e 's/en_US/en/' doc/CMakeLists.txt || die "sed failed"
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with opera QCA2)
-		$(cmake-utils_use_with opera QtOAuth)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/www-client/rekonq/rekonq-1.3.ebuild b/www-client/rekonq/rekonq-2.1.ebuild
index 6e8d5147e5ad..fe3a29cbd1c5 100644
--- a/www-client/rekonq/rekonq-1.3.ebuild
+++ b/www-client/rekonq/rekonq-2.1.ebuild
@@ -1,17 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/rekonq-1.3.ebuild,v 1.1 2012/10/31 15:29:57 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/rekonq-2.1.ebuild,v 1.1 2013/01/28 15:57:41 kensington Exp $
 
-EAPI=4
+EAPI=5
 
 WEBKIT_REQUIRED="always"
-QT_MINIMAL="4.8"
-KDE_MINIMAL="4.7"
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl
-hu is it ja km ko lt nb nds nl pl pt pt_BR ro ru sk sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW"
+KDE_LINGUAS="ca da de el es et fi fr hu ia it km lt nb nl pl pt pt_BR sk sl
+sr sr@ijekavian sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
 KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED=test
 inherit kde4-base
 
 DESCRIPTION="A browser based on qt-webkit"
@@ -32,9 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-# Almost all test fails
-RESTRICT="test"
-
 src_prepare() {
 	# KDE_LINGUAS is also used to install appropriate handbooks
 	# since there is no en_US 'translation', it cannot be added