diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-11-12 17:13:22 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-11-12 17:13:22 +0000 |
| commit | 27ae72dc999ddae86a7f405677cba8dfbe5485b8 (patch) | |
| tree | 341ee5b7472c651047d40d647231ae0ce461a5bd /dev-util | |
| parent | Version bump. (diff) | |
| download | gentoo-2-27ae72dc999ddae86a7f405677cba8dfbe5485b8.tar.gz gentoo-2-27ae72dc999ddae86a7f405677cba8dfbe5485b8.tar.bz2 gentoo-2-27ae72dc999ddae86a7f405677cba8dfbe5485b8.zip | |
Remove kde-base/kdelibs:3.5 support (#252571).
(Portage version: 2.2_rc49/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/xxdiff/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/xxdiff/xxdiff-3.2-r1.ebuild | 45 |
2 files changed, 18 insertions, 32 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/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 } |