Remove kde-base/kdelibs:3.5 support (#252571).

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

3 files changed, 20 insertions, 44 deletions

diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index ed62d4ed9bb4..10edd9e80d90 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/xxdiff
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.48 2009/07/12 08:39:55 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.49 2009/11/12 17:13:22 ssuominen Exp $
+
+  12 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> xxdiff-3.2-r1.ebuild:
+  Remove kde-base/kdelibs:3.5 support (#252571).
 
   12 Jul 2009; Petteri Räty <betelgeuse@gentoo.org> xxdiff-3.2-r1.ebuild:
   HOMEPAGE has moved
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index fb3752ce0b06..7983a4a60ca7 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kdesupport.patch 588 RMD160 e074c1e222915db5a73db9bd183133bb3abed78e SHA1 600cb81828f908791de77a2821a1af0f9f388b99 SHA256 c64273cf6b4368547f5539fa12eb6c40077d625a2a3342b925437ad0c636cbb2
 AUX xxdiff-3.2-gcc43.patch 469 RMD160 07e8a831384146ed08870e96ca1c7a1e21f5df98 SHA1 faa0b0a329d1b2c7981c4e38246e5778c2acf600 SHA256 a707fa685bcc094dce8e7b577ca5396b52b1463fbbcc294e711e88d8696c9b8a
 AUX xxdiff-3.2-kdesupport.patch 492 RMD160 ebaa92902e28f5370b29f1d964e87783b7d28f52 SHA1 3a6a112a6f2bcd203e41ac41dadd2bb852db1258 SHA256 36e8276f74941a71a72ab2b73c542ce57e5a33211731029e2f39ed8605b89a50
 DIST xxdiff-3.2.tar.bz2 1341967 RMD160 12e7527f39713b925f05b687c2ad8b60459bb670 SHA1 ab2848fd9279f55b5db270f319ad4791154ecf82 SHA256 965534bab462aea8aacb6c35c0683c1079f06d055ff13820584ac862134db2b8
-EBUILD xxdiff-3.2-r1.ebuild 2040 RMD160 36ab4f2a6686aa16eafe941b91188425fa80e4ad SHA1 d13f49796f866d667ace83d613f6cb59d26dce3e SHA256 9e1d8f42a3cfc73cb03a459554921be24734a1f61286ad890740b0d224c2f1ae
-MISC ChangeLog 6582 RMD160 38fc625ef3d007852e12f98c6cc05fa4a644bc3e SHA1 b0706189c1abc0d5062986b0048a64f893a280a4 SHA256 2cd700d4ca21b258b6555bcc7c21b1a1225d4deefff00008f8ba473478fe2a06
+EBUILD xxdiff-3.2-r1.ebuild 1698 RMD160 cad8cbd846894b626e8e12801b1cf888b4cb3ad5 SHA1 37f6bf7758f924341ca9c5d0d67091c56e7f8419 SHA256 29f73cb9c14509cff9f40d0f6be7e1d2eb48932a6dbfb4204c967f76998f411b
+MISC ChangeLog 6707 RMD160 04afaf26bc412955b5bcb233ada6dbe7b0ddf3ac SHA1 8597a0d21fbc785fd289bc70f12e1f8fda68bdfd SHA256 e7ab626217a535cefe3584fd7989e9acc0e527e83e82349103af387a69a241ad
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iEYEARECAAYFAkpZoVwACgkQcxLzpIGCsLRMKgCgnG8HT4kNCLcXc0zvVweUgbL+
-bXgAoITpXZCMswt20Gd4ZAKqZv1Il3N5
-=n/ZQ
------END PGP SIGNATURE-----
diff --git a/dev-util/xxdiff/xxdiff-3.2-r1.ebuild b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
index 354bbc373b3c..817de850de61 100644
--- a/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2-r1.ebuild,v 1.7 2009/07/12 08:39:55 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2-r1.ebuild,v 1.8 2009/11/12 17:13:22 ssuominen Exp $
 
-EAPI="1"
-
-inherit distutils eutils kde-functions toolchain-funcs
+EAPI=1
+inherit distutils eutils toolchain-funcs qt3
 
 DESCRIPTION="A graphical file and directories comparator and merge tool."
 HOMEPAGE="http://furius.ca/xxdiff/"
@@ -13,30 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE="kde python debug"
+IUSE="python debug"
 
-RDEPEND="=x11-libs/qt-3*
-	kde? ( kde-base/kdelibs:3.5 )"
-DEPEND="${RDEPEND}
+COMMON_DEPEND="x11-libs/qt:3"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/diffutils"
+DEPEND="${COMMON_DEPEND}
 	sys-devel/flex
 	|| ( sys-devel/bison dev-util/yacc )"
-RDEPEND="${RDEPEND}
-	sys-apps/diffutils"
-
-set-kdedir 3
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc43.patch #214181
 
-	if use kde; then
-		cd "${S}/src"
-		epatch "${FILESDIR}/${P}-kdesupport.patch"
-		sed -i "s:/usr/include/kde:${KDEDIR}/include:g" xxdiff.pro
-		sed -i "s:QMAKE_LIBS +=:QMAKE_LIBS+= -L${KDEDIR}/lib:g" xxdiff.pro
-	fi
-
 	use debug || sed -i -e '/CONFIG/s:debug::' "${S}/src/xxdiff.pro"
 
 	# The getopt replacements used here are a bit of a moot point for
@@ -49,30 +38,24 @@ src_unpack() {
 }
 
 src_compile() {
-	if use python; then
-		distutils_src_compile
-	fi
+	use python && distutils_src_compile
 
 	cd src
-	make -f Makefile.bootstrap makefile || die "Makefile creation failed"
+	emake -f Makefile.bootstrap makefile || die
 	emake \
 		CC="$(tc-getCC) ${CFLAGS}" \
 		CXX="$(tc-getCXX) ${CXXFLAGS}" \
 		LINK="$(tc-getCXX) ${LDFLAGS}" \
-		|| die "make failed"
+		|| die
 	cd ../doc
-	emake || die "Doc failed"
+	emake || die
 
 }
 
 src_install () {
-	if use python; then
-		distutils_src_install
-	fi
-
+	use python && distutils_src_install
 	dobin bin/xxdiff bin/xx-cvs-diff bin/xx-encrypted bin/xx-find-grep-sed bin/xx-match
 	doman src/xxdiff.1
 	dodoc README CHANGES TODO
-	cd doc
-	dodoc xxdiff-doc.html
+	dohtml doc/xxdiff-doc.html
 }