Version bump. Remove old.

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

3 files changed, 12 insertions, 69 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/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