New revision adding a debug useflag to enable/disable the debug codepaths (the default was enabled), to respect users' CFLAGS/CXXFLAGS and compiler chosen, and to remove the getopt replacement when the target system already contains the getopt_long function. Also add ~x86-fbsd keyword as per bug #178435.

Package-Manager: portage-2.1.2.7

4 files changed, 110 insertions, 5 deletions

diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index de916d5807a4..8075a233c708 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/xxdiff
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.40 2007/04/21 19:09:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.41 2007/05/24 16:05:32 flameeyes Exp $
+
+*xxdiff-3.2-r1 (24 May 2007)
+
+  24 May 2007; Diego Pettenò <flameeyes@gentoo.org> +xxdiff-3.2-r1.ebuild:
+  New revision adding a debug useflag to enable/disable the debug codepaths
+  (the default was enabled), to respect users' CFLAGS/CXXFLAGS and compiler
+  chosen, and to remove the getopt replacement when the target system already
+  contains the getopt_long function. Also add ~x86-fbsd keyword as per bug
+  #178435.
 
   21 Apr 2007; Raúl Porcel <armin76@gentoo.org> xxdiff-3.2.ebuild:
   ia64 stable
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 4e04ac2be672..a598c7f06f3b 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdesupport.patch 588 RMD160 e074c1e222915db5a73db9bd183133bb3abed78e SHA1 600cb81828f908791de77a2821a1af0f9f388b99 SHA256 c64273cf6b4368547f5539fa12eb6c40077d625a2a3342b925437ad0c636cbb2
 MD5 90983c130466c6d73a77a59889fbc673 files/kdesupport.patch 588
 RMD160 e074c1e222915db5a73db9bd183133bb3abed78e files/kdesupport.patch 588
@@ -12,14 +15,18 @@ EBUILD xxdiff-3.0.2-r1.ebuild 1547 RMD160 4a05591cb23f8fe2c68831303226db9c42b29b
 MD5 e98e2c40d5cd9527666c4efd50e2dcc3 xxdiff-3.0.2-r1.ebuild 1547
 RMD160 4a05591cb23f8fe2c68831303226db9c42b29be7 xxdiff-3.0.2-r1.ebuild 1547
 SHA256 9e1316b8d4dcf7a79dc4063b4b555a7e86482d0ee6101eef7614ca8fb48d9102 xxdiff-3.0.2-r1.ebuild 1547
+EBUILD xxdiff-3.2-r1.ebuild 1987 RMD160 953b85cf37ad98fd7fe9accee875178e909cfa24 SHA1 f7c2c05dd77700e38f43a80184b333c1987b8a0e SHA256 46462cd0d4dc0c2e792747660e3e5758576031f7761f4d3c3a8a03b8d42de3e7
+MD5 b5a62c90ae479665a2870d1843b64bf2 xxdiff-3.2-r1.ebuild 1987
+RMD160 953b85cf37ad98fd7fe9accee875178e909cfa24 xxdiff-3.2-r1.ebuild 1987
+SHA256 46462cd0d4dc0c2e792747660e3e5758576031f7761f4d3c3a8a03b8d42de3e7 xxdiff-3.2-r1.ebuild 1987
 EBUILD xxdiff-3.2.ebuild 1357 RMD160 551c599cff69718169fb811d7eb5fe15590413a4 SHA1 78f1273fda884e9a11a1bfb86449d5d920069814 SHA256 bd33848d11d748aba5560d0652bf6e241a1b52f529c11fe98f38c96ad314e5cf
 MD5 62f6845c08958bd2b731558d04eb1139 xxdiff-3.2.ebuild 1357
 RMD160 551c599cff69718169fb811d7eb5fe15590413a4 xxdiff-3.2.ebuild 1357
 SHA256 bd33848d11d748aba5560d0652bf6e241a1b52f529c11fe98f38c96ad314e5cf xxdiff-3.2.ebuild 1357
-MISC ChangeLog 5252 RMD160 e0cf25c7fcca87b18829cea382ff3f6d8e248492 SHA1 87f8b8a5456f10504e3d4517faa26ee09882774c SHA256 d352c46e804235e076f7b7b927aad7ca5c81a2919409f407c2162b22545f9a99
-MD5 7d54cace6522b37736835e20d531f587 ChangeLog 5252
-RMD160 e0cf25c7fcca87b18829cea382ff3f6d8e248492 ChangeLog 5252
-SHA256 d352c46e804235e076f7b7b927aad7ca5c81a2919409f407c2162b22545f9a99 ChangeLog 5252
+MISC ChangeLog 5677 RMD160 1fe665f64578791bad34e3f5057ea27b4501afb3 SHA1 c30871510aa1f17a043da12070537450b70e6e66 SHA256 bea59dbd415d714c56e91b67b5e38dc9c8b855022a2b7e4426ea55a3a69ef641
+MD5 8e6f4a92c6e548ddb8a90e97a09698d2 ChangeLog 5677
+RMD160 1fe665f64578791bad34e3f5057ea27b4501afb3 ChangeLog 5677
+SHA256 bea59dbd415d714c56e91b67b5e38dc9c8b855022a2b7e4426ea55a3a69ef641 ChangeLog 5677
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -30,3 +37,13 @@ SHA256 280d42dd4e6eb95602757307a45db6d91d8ab3be006dd9053dce78071f222f5f files/di
 MD5 31973bf9cd02fab330d10569ba3d641e files/digest-xxdiff-3.2 238
 RMD160 722852fa60790c2a5169a89419a1f553781c22dc files/digest-xxdiff-3.2 238
 SHA256 18958a9ef1f83acaaae4a5a5afb04a7ab54037c6386bc16519288666d926624f files/digest-xxdiff-3.2 238
+MD5 31973bf9cd02fab330d10569ba3d641e files/digest-xxdiff-3.2-r1 238
+RMD160 722852fa60790c2a5169a89419a1f553781c22dc files/digest-xxdiff-3.2-r1 238
+SHA256 18958a9ef1f83acaaae4a5a5afb04a7ab54037c6386bc16519288666d926624f files/digest-xxdiff-3.2-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGVbfSAiZjviIA2XgRAnrXAKDSWGZB/rtoq7dr1oFBVwWCKBGreACghBg1
+btKgVtbpLAf5Vv74zfv38aE=
+=RWSd
+-----END PGP SIGNATURE-----
diff --git a/dev-util/xxdiff/files/digest-xxdiff-3.2-r1 b/dev-util/xxdiff/files/digest-xxdiff-3.2-r1
new file mode 100644
index 000000000000..2beb8d33a69b
--- /dev/null
+++ b/dev-util/xxdiff/files/digest-xxdiff-3.2-r1
@@ -0,0 +1,3 @@
+MD5 301ff399a1e4be8b68c38c3e27c0b1ad xxdiff-3.2.tar.bz2 1341967
+RMD160 12e7527f39713b925f05b687c2ad8b60459bb670 xxdiff-3.2.tar.bz2 1341967
+SHA256 965534bab462aea8aacb6c35c0683c1079f06d055ff13820584ac862134db2b8 xxdiff-3.2.tar.bz2 1341967
diff --git a/dev-util/xxdiff/xxdiff-3.2-r1.ebuild b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
new file mode 100644
index 000000000000..e2906b28a429
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
@@ -0,0 +1,76 @@
+# 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-r1.ebuild,v 1.1 2007/05/24 16:05:32 flameeyes Exp $
+
+inherit distutils eutils kde-functions toolchain-funcs
+
+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 ~x86-fbsd"
+IUSE="kde python debug"
+
+RDEPEND="=x11-libs/qt-3*
+	kde? ( >=kde-base/kdelibs-3.1 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	|| ( sys-devel/bison dev-util/yacc )"
+
+RDEPEND="${RDEPEND}
+	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
+
+	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
+	# some systems, and they are also causing warnings. Remove them when
+	# they are not needed.
+	if use elibc_glibc || use elibc_uclibc || use elibc_FreeBSD; then
+		rm "${S}"/src/getopt{1.c,.c,.h} || die "unable to remove getopt"
+		sed -i -e '/getopt/d' "${S}/src/xxdiff.pro" || die "unable to remove getopt"
+	fi
+}
+
+src_compile() {
+	if use python; then
+		distutils_src_compile
+	fi
+
+	cd src
+	make -f Makefile.bootstrap makefile || die "Makefile creation failed"
+	emake \
+		CC="$(tc-getCC) ${CFLAGS}" \
+		CXX="$(tc-getCXX) ${CXXFLAGS}" \
+		LINK="$(tc-getCXX) ${LDFLAGS}" \
+		|| die "make failed"
+	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
+}