sparc stable, fix kde deps, bug #213428

(Portage version: 2.1.4.4)

4 files changed, 10 insertions, 126 deletions

diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 4f3d3829ba80..5d6a57022850 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/xxdiff
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.44 2008/03/18 19:52:26 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.45 2008/03/18 19:57:26 armin76 Exp $
+
+  18 Mar 2008; Raúl Porcel <armin76@gentoo.org> -xxdiff-3.0.2-r1.ebuild,
+  -xxdiff-3.2.ebuild, xxdiff-3.2-r1.ebuild:
+  sparc stable, fix kde deps, bug #213428
 
   18 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> xxdiff-3.2-r1.ebuild:
   amd64 stable
diff --git a/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild b/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild
deleted file mode 100644
index 0c3cddb4d7a7..000000000000
--- a/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild,v 1.7 2005/10/11 09:39:50 greg_g Exp $
-
-inherit eutils kde-functions
-
-DESCRIPTION="A graphical file and directories comparator and merge tool."
-HOMEPAGE="http://xxdiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ~ppc sparc x86"
-IUSE="kde"
-
-DEPEND="=x11-libs/qt-3*
-	kde? ( >=kde-base/kdelibs-3.1 )"
-
-RDEPEND="${DEPEND}
-	sys-apps/diffutils"
-
-DEPEND="${DEPEND}
-	=dev-util/tmake-1.8*"
-
-set-kdedir 3
-
-src_unpack()
-{
-	unpack ${A}
-
-	if use kde; then
-		cd ${S}/src
-		cp ${FILESDIR}/kdesupport.patch ${T}/
-		sed -i -e "s:/usr/kde/3.1:${KDEDIR}:g" ${T}/kdesupport.patch
-		epatch ${T}/kdesupport.patch
-	fi
-}
-
-src_compile() {
-	cd src
-	tmake -o Makefile xxdiff.pro
-
-	### borrowed from kde.eclass #
-	#
-	# fix the sandbox errors "can't writ to .kde or .qt" problems.
-	# this is a fake homedir that is writeable under the sandbox, so that the build
-	# process can do anything it wants with it.
-	REALHOME="${HOME}"
-	mkdir -p ${T}/fakehome/.kde
-	mkdir -p ${T}/fakehome/.qt
-	export HOME="${T}/fakehome"
-
-	# things that should access the real homedir
-	[ -d "${REALHOME}/.ccache" ] && ln -sf "${REALHOME}/.ccache" "${HOME}/"
-
-	emake || die
-}
-
-src_install () {
-	dobin bin/xxdiff bin/xxdiff-cvs-diff bin/xxdiff-encrypted bin/xxdiff-find-grep-sed bin/xxdiff-match
-	doman src/xxdiff.1
-	dodoc README CHANGES TODO
-}
diff --git a/dev-util/xxdiff/xxdiff-3.2-r1.ebuild b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
index 23d5a6f981e1..8529fad20d7f 100644
--- a/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 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.4 2008/03/18 19:52:26 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2-r1.ebuild,v 1.5 2008/03/18 19:57:26 armin76 Exp $
+
+EAPI="1"
 
 inherit distutils eutils kde-functions toolchain-funcs
 
@@ -10,11 +12,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
 IUSE="kde python debug"
 
 RDEPEND="=x11-libs/qt-3*
-	kde? ( >=kde-base/kdelibs-3.1 )"
+	kde? ( kde-base/kdelibs:3.5 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/flex
diff --git a/dev-util/xxdiff/xxdiff-3.2.ebuild b/dev-util/xxdiff/xxdiff-3.2.ebuild
deleted file mode 100644
index 5a820f6371a9..000000000000
--- a/dev-util/xxdiff/xxdiff-3.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2.ebuild,v 1.8 2007/06/26 02:05:52 mr_bones_ Exp $
-
-inherit distutils eutils kde-functions
-
-DESCRIPTION="A graphical file and directories comparator and merge tool."
-HOMEPAGE="http://xxdiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
-IUSE="kde python"
-
-DEPEND="=x11-libs/qt-3*
-	kde? ( >=kde-base/kdelibs-3.1 )
-	sys-devel/flex
-	|| ( sys-devel/bison dev-util/yacc )"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils"
-
-set-kdedir 3
-
-src_unpack() {
-	unpack ${A}
-
-	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
-}
-
-src_compile() {
-	if use python; then
-		distutils_src_compile
-	fi
-
-	cd src
-	make -f Makefile.bootstrap makefile || die "Makefile creation failed"
-	emake || die
-	cd ../doc
-	emake || die "Doc failed"
-
-}
-
-src_install () {
-	if use python; then
-		distutils_src_install
-	fi
-
-	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
-}