Version bump. Fixes bug 336237. Thanks to Diego for the report.

Package-Manager: portage-2.1.9/cvs/Linux x86_64

4 files changed, 22 insertions, 53 deletions

diff --git a/app-text/bibutils/ChangeLog b/app-text/bibutils/ChangeLog
index 1bcd80eeeec6..c0b749dac8a1 100644
--- a/app-text/bibutils/ChangeLog
+++ b/app-text/bibutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/bibutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibutils/ChangeLog,v 1.8 2010/01/07 02:21:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibutils/ChangeLog,v 1.9 2010/09/06 16:53:59 xarthisius Exp $
+
+*bibutils-4.10 (06 Sep 2010)
+
+  06 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org> -bibutils-4.6.ebuild,
+  -bibutils-4.7.ebuild, +bibutils-4.10.ebuild:
+  Version bump. Fixes bug 336237. Thanks to Diego for the report.
 
 *bibutils-4.7 (07 Jan 2010)
 
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index ccea225915f0..f89fd722b33a 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST bibutils_4.6_src.tgz 511182 RMD160 eb23a73cefc648a492ba1278d8e5e5f78b2b308d SHA1 7a32cc30e18ae2b8c3817f94f67782481f9ed584 SHA256 b933222ba268d544817cbe81d7d3a7ae7d718787f1a17b0abb3a0d9ca325599e
-DIST bibutils_4.7_src.tgz 511275 RMD160 af589c30021154a656f749769440dd52eb552985 SHA1 e47335284b34c4b8889263b02a3658b476e4144b SHA256 68002e7660d1e17054a2524f59faeac5be393d7ecf9a0bc02f983f38eedadc49
-EBUILD bibutils-4.6.ebuild 1138 RMD160 160177ed71f8b57a1ddde1a2851c0b2a14a22dbf SHA1 fffac49e8f43be5a32fe42c6d28f116a19b8a9b6 SHA256 8283c5a59202af61770ec930e7fe85b22996f6b40335be72484fcf0833f9e3f2
-EBUILD bibutils-4.7.ebuild 1139 RMD160 12f56d3b0ec216655e6f30b8c97310396c0c28cb SHA1 d9500790a0a70dd176f4f3d1bce21227607f1eb2 SHA256 70a23703f40155c7bb2e71856ba6ad55d4c1388b75e1bbe0257079b596d8aea9
-MISC ChangeLog 1312 RMD160 47b5bbf7782311cd479a07bffdfca2e185aac895 SHA1 0fafbdebe210b07c929e5f4da2657ad3fc45a4d1 SHA256 80f8bacd11fe84881589cbc3eee5c06934928aa48bcf9c9ecc557f88acc37e7d
+DIST bibutils_4.10_src.tgz 513833 RMD160 9238c71d17acd151b0e2ffd2c5e5d39737232aa7 SHA1 11a5d03f232b331a6500570e77c0a31d9892c1d9 SHA256 a8febf4432f74292972596fc7a168552c0144c03b42843392fbed75b50d6e5ed
+EBUILD bibutils-4.10.ebuild 1182 RMD160 3f57691189bb2602de7d267b2e7a009415004025 SHA1 f0af3c8c7b7c0b3b4c73384647bed54eb6dbec95 SHA256 b8888d5a65e7a8f6d837d0ca34cf356480ccad6a0b87ee84dae9e0c3f307cbbd
+MISC ChangeLog 1534 RMD160 df8354570be9f9a380b3703d69fd23ceb9375453 SHA1 2f907474e5e7e2017bbe6398e8e6278ef5b131b4 SHA256 ce1ef5236aa3f575da1a43b3b3a43ed5730a9365605e383417e4a0935ffc9cfb
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAktFTdwACgkQ1ycZbhPLE2BdaQCcDoo4j4QlL71v4bLpjMWfjnst
-uSAAoKHsluJniQ/8Uo8WPHIY7Zxx767i
-=l1dR
+iJwEAQECAAYFAkyFHLEACgkQIiMqcbOVdxRZ7wQAn2Au6wtmHjPTOWM8rSzLUAY8
+lSNhb5p5pAW2qjFAs1BjagcgXhIFAYAe0Ftw25FqcpMnWIjX6FgphkPDQwHdmPA6
+qVpRlRGH+u+zBZbBBSygqBTJ5VCX5jiZLzgDPhhoZeGXWlDM4i8UnfzB7+/RHWQm
+NTczSmICSRGMHNKZQAU=
+=Zne+
 -----END PGP SIGNATURE-----
diff --git a/app-text/bibutils/bibutils-4.7.ebuild b/app-text/bibutils/bibutils-4.10.ebuild
index 2441e964f487..4bc6d3562bd3 100644
--- a/app-text/bibutils/bibutils-4.7.ebuild
+++ b/app-text/bibutils/bibutils-4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibutils/bibutils-4.7.ebuild,v 1.1 2010/01/07 02:21:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibutils/bibutils-4.10.ebuild,v 1.1 2010/09/06 16:53:59 xarthisius Exp $
 
 EAPI=2
 inherit toolchain-funcs
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	# The custom configure script sucks, so we'll just do its
@@ -28,11 +28,12 @@ src_prepare() {
 		-e 's:REPLACE_POSTFIX::g' \
 		-e 's:make:$(MAKE):g' \
 		Makefile_start > Makefile \
-		|| die "Failed to set upt Makefile"
+		|| die "Failed to set up Makefile"
+	sed -e '/$(CC) $^ -o $@/d' -i bin/Makefile || die #336237
 }
 
 src_install() {
 	dodir /usr/bin
-	emake install || die "emake install failed"
-	dodoc ChangeLog
+	emake install || die
+	dodoc ChangeLog || die
 }
diff --git a/app-text/bibutils/bibutils-4.6.ebuild b/app-text/bibutils/bibutils-4.6.ebuild
deleted file mode 100644
index 82130efac637..000000000000
--- a/app-text/bibutils/bibutils-4.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibutils/bibutils-4.6.ebuild,v 1.1 2009/11/08 12:59:44 patrick Exp $
-
-EAPI=2
-inherit toolchain-funcs
-
-MY_P="${PN}_${PV}"
-DESCRIPTION="Interconverts between various bibliography formats using a common XML intermediate"
-HOMEPAGE="http://www.scripps.edu/~cdputnam/software/bibutils"
-SRC_URI="http://www.scripps.edu/~cdputnam/software/bibutils/${MY_P}_src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# The custom configure script sucks, so we'll just do its
-	# job ourselves
-	rm -f Makefile configure || die "Failed to purge old Makefile"
-	sed \
-		-e "s:REPLACE_CC:CC=\"$(tc-getCC) ${CFLAGS}\":g" \
-		-e "s:REPLACE_RANLIB:RANLIB=\"$(tc-getRANLIB)\":g" \
-		-e "s:REPLACE_INSTALLDIR:\"${D}/usr/bin\":g" \
-		-e 's:REPLACE_POSTFIX::g' \
-		-e 's:make:$(MAKE):g' \
-		Makefile_start > Makefile \
-		|| die "Failed to set upt Makefile"
-}
-
-src_install() {
-	dodir /usr/bin
-	emake install || die "emake install failed"
-	dodoc ChangeLog
-}