Fixing bug #148038

Package-Manager: portage-2.1.2_pre2-r3

4 files changed, 96 insertions, 9 deletions

diff --git a/dev-util/darcs/ChangeLog b/dev-util/darcs/ChangeLog
index f25eb022207b..033a9b3acbee 100644
--- a/dev-util/darcs/ChangeLog
+++ b/dev-util/darcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/darcs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.58 2006/08/12 16:48:12 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.59 2006/10/06 18:11:37 araujo Exp $
+
+*darcs-1.0.8-r1 (06 Oct 2006)
+
+  06 Oct 2006; Luis F. Araujo <araujo@gentoo.org> +darcs-1.0.8-r1.ebuild:
+  Fixing bug #148038
 
 *darcs-1.0.8 (12 Aug 2006)
 
diff --git a/dev-util/darcs/Manifest b/dev-util/darcs/Manifest
index 672d71ba8f55..da2178e6b279 100644
--- a/dev-util/darcs/Manifest
+++ b/dev-util/darcs/Manifest
@@ -22,14 +22,18 @@ EBUILD darcs-1.0.7.ebuild 1547 RMD160 8b1ca044013ad1f76d7cbda11525ffd921e9aedb S
 MD5 9bf8b4019c1523d56beb9b2bdf127a7f darcs-1.0.7.ebuild 1547
 RMD160 8b1ca044013ad1f76d7cbda11525ffd921e9aedb darcs-1.0.7.ebuild 1547
 SHA256 a06b1fbbf1d0981867168ee5141e6401583d61d23f0c5721f58431f55d3490dc darcs-1.0.7.ebuild 1547
+EBUILD darcs-1.0.8-r1.ebuild 2063 RMD160 00e8934eb420e8b8170ae003b557bb2377da8884 SHA1 5c416311b71bfff38fa14bf0bb05081137f729ec SHA256 afaf86b8f164fd9ff50f066671b4e66b3bd3ccbd00a4a6bc61e93af9d4a9aef1
+MD5 5b14257b0282fbe7d265839dab7acb69 darcs-1.0.8-r1.ebuild 2063
+RMD160 00e8934eb420e8b8170ae003b557bb2377da8884 darcs-1.0.8-r1.ebuild 2063
+SHA256 afaf86b8f164fd9ff50f066671b4e66b3bd3ccbd00a4a6bc61e93af9d4a9aef1 darcs-1.0.8-r1.ebuild 2063
 EBUILD darcs-1.0.8.ebuild 1548 RMD160 c3187d513464599809fd316470c50802a65f2e4b SHA1 37678e56738cc3731bdf7862732d5439f9f8b530 SHA256 4fb1da88eff362959e90a87583d74024b9b33b4dbebf6367fc46ebeba8f0822d
 MD5 b62bb7eccbffdcf5c69c28da9b6a4dc6 darcs-1.0.8.ebuild 1548
 RMD160 c3187d513464599809fd316470c50802a65f2e4b darcs-1.0.8.ebuild 1548
 SHA256 4fb1da88eff362959e90a87583d74024b9b33b4dbebf6367fc46ebeba8f0822d darcs-1.0.8.ebuild 1548
-MISC ChangeLog 8208 RMD160 2a00194381b44940c9d50b4d72641551843b2009 SHA1 46755e20e08325003d4a10cc186b53468682654c SHA256 47b4b0b035063442a0e9fcca1e2ebb8ae7c8c8bf7fcffea84392dc6274cff1ec
-MD5 031bc9ec1203c8b35d7c2a4bdb7b01a0 ChangeLog 8208
-RMD160 2a00194381b44940c9d50b4d72641551843b2009 ChangeLog 8208
-SHA256 47b4b0b035063442a0e9fcca1e2ebb8ae7c8c8bf7fcffea84392dc6274cff1ec ChangeLog 8208
+MISC ChangeLog 8333 RMD160 6df8e7c2079e03ccba975f990a5b7a1da8929915 SHA1 4cd6422e953d7d24986b3c623c4a0373aa8e6412 SHA256 2ee9311c2deefddfe3db510e708e901113cd12dab3c7892089ed733a83fb45bf
+MD5 3d868e122791925ee2ae7cbf646a20ec ChangeLog 8333
+RMD160 6df8e7c2079e03ccba975f990a5b7a1da8929915 ChangeLog 8333
+SHA256 2ee9311c2deefddfe3db510e708e901113cd12dab3c7892089ed733a83fb45bf ChangeLog 8333
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -49,10 +53,13 @@ SHA256 f60ab21abc29fb110593b246c79dfc211e38c9bfa02f0e0d2b9f78f43fc389b4 files/di
 MD5 83f45e19da5d23604c31048791a460e5 files/digest-darcs-1.0.8 238
 RMD160 1f85d2e7120631f84465e1aca08b5b71a38df228 files/digest-darcs-1.0.8 238
 SHA256 89551bc6771ab740ee0edfa2a2648e105bc5b20cb61386a46d20e15b38a62b0e files/digest-darcs-1.0.8 238
+MD5 83f45e19da5d23604c31048791a460e5 files/digest-darcs-1.0.8-r1 238
+RMD160 1f85d2e7120631f84465e1aca08b5b71a38df228 files/digest-darcs-1.0.8-r1 238
+SHA256 89551bc6771ab740ee0edfa2a2648e105bc5b20cb61386a46d20e15b38a62b0e files/digest-darcs-1.0.8-r1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE3gZg1n/CYbXjntIRAujGAJ4yfxLPC3iFB536PEESY/21hRAOxgCfSG66
-bRAJUpLrFdVDbgNA10ZCYh4=
-=nhll
+iD8DBQFFJpxWaTNpke9pJcURAhSaAJ9vKae3caKSo9o1/Rmck8ZjZ0R7sQCfYQoS
+YM9DQEPYUtdQHrKLua+Xbvw=
+=0oT9
 -----END PGP SIGNATURE-----
diff --git a/dev-util/darcs/darcs-1.0.8-r1.ebuild b/dev-util/darcs/darcs-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..a733986f12d9
--- /dev/null
+++ b/dev-util/darcs/darcs-1.0.8-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.8-r1.ebuild,v 1.1 2006/10/06 18:11:37 araujo Exp $
+
+inherit base autotools
+
+DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
+HOMEPAGE="http://abridgegame.org/darcs"
+MY_P0="${P/_rc/rc}"
+MY_P="${MY_P0/_pre/pre}"
+SRC_URI="http://abridgegame.org/darcs/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND=">=net-misc/curl-7.10.2
+	virtual/mta
+	>=virtual/ghc-6.2.2
+	doc?  ( virtual/tetex
+			>=dev-tex/latex2html-2002.2.1_pre20041025-r1 )"
+
+RDEPEND=">=net-misc/curl-7.10.2
+	virtual/mta"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	base_src_unpack
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-ghc66.patch"
+
+	# If we're going to use the CFLAGS with GHC's -optc flag then we'd better
+	# use it with -opta too or it'll break with some CFLAGS, eg -mcpu on sparc
+	sed -i 's:\($(addprefix -optc,$(CFLAGS))\):\1 $(addprefix -opta,$(CFLAGS)):' \
+		${S}/autoconf.mk.in
+
+	# On ia64 we need to tone down the level of inlining so we don't break some
+	# of the low level ghc/gcc interaction gubbins.
+	use ia64 && sed -i 's/-funfolding-use-threshold20//' "${S}/GNUmakefile"
+}
+
+src_compile() {
+	# Since we've patched the build system:
+	eautoreconf
+
+	econf $(use_with doc docs) \
+		|| die "configure failed"
+	emake all || die "make failed"
+}
+
+src_test() {
+	make test
+}
+
+src_install() {
+	make DESTDIR="${D}" installbin || die "installation failed"
+	# The bash completion should be installed in /usr/share/bash-completion/
+	# rather than /etc/bash_completion.d/ . Fixes bug #148038.
+	insinto "/usr/share/bash-completion" \
+		&& doins "${D}/etc/bash_completion.d/darcs" \
+		&& rm    "${D}/etc/bash_completion.d/darcs" \
+		&& rmdir "${D}/etc/bash_completion.d" \
+		&& rmdir "${D}/etc" \
+		|| die "fixing location of darcs bash completion failed"
+	if use doc; then
+		dodoc "${S}/darcs.ps"
+		dohtml -r "${S}/manual/"*
+	fi
+}
diff --git a/dev-util/darcs/files/digest-darcs-1.0.8-r1 b/dev-util/darcs/files/digest-darcs-1.0.8-r1
new file mode 100644
index 000000000000..fda527dde45e
--- /dev/null
+++ b/dev-util/darcs/files/digest-darcs-1.0.8-r1
@@ -0,0 +1,3 @@
+MD5 a7a26d1a98c5675dcab4c2cc30eba59d darcs-1.0.8.tar.gz 1010010
+RMD160 a95309f7dc79b29d7e4f237627aa300a84aa5331 darcs-1.0.8.tar.gz 1010010
+SHA256 36cf64b10a9e09e4bb2d4bc78371a8b511e7e5bbf13deb1a754e867b0efcfcac darcs-1.0.8.tar.gz 1010010