amd64/x86 stable, remove old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 7 insertions, 96 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 27b7851a41d4..f99510d067db 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.70 2014/03/20 22:08:32 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.71 2014/04/24 14:38:17 johu Exp $
+
+  24 Apr 2014; Johannes Huber <johu@gentoo.org> -kdiff3-0.9.97-r1.ebuild,
+  kdiff3-0.9.97-r2.ebuild:
+  amd64/x86 stable, remove old.
 
 *kdiff3-0.9.97-r2 (20 Mar 2014)
 
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
deleted file mode 100644
index 243db1ddc948..000000000000
--- a/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r1.ebuild,v 1.5 2013/03/02 21:29:51 hwoarang Exp $
-
-EAPI=4
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fr ga
-	gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk
-	sv ta tg tr ug uk zh_CN zh_TW"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
-	KDE_HANDBOOK="optional"
-else
-	ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
-	KEYWORDS=""
-fi
-
-KDE_REQUIRED="optional"
-inherit kde4-base qt4-r2
-
-DESCRIPTION="Qt/KDE based frontend to diff3"
-HOMEPAGE="http://kdiff3.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug kde"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	kde? ( $(add_kdebase_dep kdelibs) )
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.97-relativepath.patch"
-)
-
-RESTRICT="!kde? ( test )"
-
-src_unpack(){
-	if [[ ${PV} == *9999* ]]; then
-		subversion_src_unpack
-	elif use kde; then
-		kde4-base_src_unpack
-	else
-		qt4-r2_src_unpack
-	fi
-}
-
-src_prepare() {
-	if ! use kde; then
-		# adapt to Gentoo paths
-		sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \
-		-e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \
-		"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
-	else
-		kde4-base_src_prepare
-	fi
-}
-
-src_configure() {
-	if use kde; then
-		kde4-base_src_configure
-	else
-		eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro
-	fi
-}
-
-src_compile() {
-	if use kde; then
-		kde4-base_src_compile
-	else
-		qt4-r2_src_compile
-	fi
-}
-
-src_install() {
-	if use kde; then
-		kde4-base_src_install
-	else
-		qt4-r2_src_install
-	fi
-}
-
-src_test() {
-	if use kde; then
-		kde4-base_src_test
-	fi
-}
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
index 09e05ef59848..c20bf81d156f 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild,v 1.1 2014/03/20 22:08:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild,v 1.2 2014/04/24 14:38:17 johu Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ if [[ ${PV} != *9999* ]]; then
 	gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw sk
 	sv ta tg tr ug uk zh_CN zh_TW"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
 	KDE_HANDBOOK="optional"
 else
 	ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"