Version bump; fix building when portage shell is set to /bin/false (bug #268605).

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 55 insertions, 11 deletions

diff --git a/sys-block/di/ChangeLog b/sys-block/di/ChangeLog
index 20fec1cf47f9..c9aa059232db 100644
--- a/sys-block/di/ChangeLog
+++ b/sys-block/di/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/di
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/ChangeLog,v 1.22 2009/04/23 19:36:43 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/di/ChangeLog,v 1.23 2010/01/10 14:11:34 flameeyes Exp $
+
+*di-4.18 (10 Jan 2010)
+
+  10 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> di-4.13.ebuild,
+  +di-4.18.ebuild:
+  Version bump; fix building when portage shell is set to /bin/false (bug
+  #268605).
 
   23 Apr 2009; Markus Meier <maekke@gentoo.org> di-4.13:
   amd64 stable, bug #264123
diff --git a/sys-block/di/Manifest b/sys-block/di/Manifest
index b958ea3c4f69..0ff39d6d0ba8 100644
--- a/sys-block/di/Manifest
+++ b/sys-block/di/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 DIST di-4.13.tar.gz 72792 RMD160 3e88a31e23ad4085dfa8b39684a228818c0e2415 SHA1 6cd254482f6075b83191e58b327516e6701840fb SHA256 50d408069217945a1cb696d773c0864c85f48d967652ab4e3ca3461de8c1318c
+DIST di-4.18.tar.gz 58106 RMD160 03e671d39616f018ca45130bd3e86591874e51ee SHA1 11a6328c56b0fb9a2eee9eef4c3052509242383f SHA256 c400a95f1445e539df82852a418a062f9a2fbcc02927d8a2840021efc2c06d7b
 DIST di-4.5.tar.gz 67749 RMD160 8af751beed3d97619982ebc23862c7b380f530b0 SHA1 0d911d4cbe2759b036b183940e0f12e9db99037f SHA256 8f71e985e3817541b22269d0fa8124656d4e102d5435a043d35e8d12b0890457
-EBUILD di-4.13.ebuild 646 RMD160 0c1fa2b7d6f097681a74b0ecce1e46cfaa5f94bb SHA1 a6c7fdcf7109350777df6af8a3f781aa16f1fbe2 SHA256 001d6b0467571e294af60fd3f122fd4a9fa2caedf4cf05392fbb9b05e9152a75
+EBUILD di-4.13.ebuild 841 RMD160 fef40e3006f0ade1f14ce547778be9f2c02a1058 SHA1 2cae9a255ef32206a3eaba6344de3c974c1c0656 SHA256 b14c083ef5f098f100aa527c6234051a81cb9c5bffa97ab8687b47e6e5e59a48
+EBUILD di-4.18.ebuild 846 RMD160 d1f920894957997f4af575e3ef163096d887f678 SHA1 fec5b1fcd80affa4ec2550b715edec47c55a0def SHA256 d38647191b1a245f9ba42cb1ec1c7c7fdca725405910cd6b9e21023107f924ed
 EBUILD di-4.5.ebuild 636 RMD160 25f829cec14e23006025de7b1dda12c582ebed62 SHA1 f3ce40791a48f21680019d96b92846ddc8b983b1 SHA256 9d547ab1fc5adba6d5bddaa7494333de018a7427608769028ab18e3639ab9b40
-MISC ChangeLog 3734 RMD160 7f77f4e289b6ed4904f2fd27382ae28b4e65df63 SHA1 f245f9002afa244cbbcadec29af86e4e1aad56c0 SHA256 885fd45cd833756a3da0e6b1a4bf6d887a81e7a6a8afe1340a7ff54e396a9629
+MISC ChangeLog 3939 RMD160 adc78cbab04886a38c52700588c4834111f46a6a SHA1 9cf75c55dd45a197a2b93296bd6fc8b0b03d5c66 SHA256 7b77bfe787ca28b9da667781d57dab5c065c48283e439bf29889acfd3ba665b7
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAknww2gACgkQkKaRLQcq0GI+VACfQbPOAfi1c6EkTRZeld9EFcgs
-t2EAnRIRrZej2N5eqtg8yrg8EV57A4s2
-=cMXB
+iEYEARECAAYFAktJ4B4ACgkQAiZjviIA2Xg69QCcCsPYShC1Lw036OcDWOjPYVl0
+hY0AoN4XDhXFu4tRAtg4r2GKrtz54Wm+
+=3yrO
 -----END PGP SIGNATURE-----
diff --git a/sys-block/di/di-4.13.ebuild b/sys-block/di/di-4.13.ebuild
index 560c6d2a2403..2d889b504b6b 100644
--- a/sys-block/di/di-4.13.ebuild
+++ b/sys-block/di/di-4.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.13.ebuild,v 1.5 2009/04/23 19:36:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.13.ebuild,v 1.6 2010/01/10 14:11:34 flameeyes Exp $
 
 inherit toolchain-funcs
 
@@ -18,7 +18,10 @@ RDEPEND=""
 
 src_compile() {
 	tc-export CC
-	SHELL=/bin/bash prefix="${D}" ${SHELL} ./Build || die
+	# execute it _with bash_; setting SHELL=/bin/bash ${SHELL} won't
+	# work because the command is interpreted _before_ the SHELL is
+	# set. And this does not work properly as a standard sh script.
+	SHELL=/bin/bash prefix="${D}" bash ./Build || die
 }
 
 src_install() {
diff --git a/sys-block/di/di-4.18.ebuild b/sys-block/di/di-4.18.ebuild
new file mode 100644
index 000000000000..e8c999f3fcb1
--- /dev/null
+++ b/sys-block/di/di-4.18.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/di/di-4.18.ebuild,v 1.1 2010/01/10 14:11:34 flameeyes Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="Disk Information Utility"
+HOMEPAGE="http://www.gentoo.com/di/"
+SRC_URI="http://www.gentoo.com/di/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-shells/bash"
+RDEPEND=""
+
+src_compile() {
+	tc-export CC
+	# execute it _with bash_; setting SHELL=/bin/bash ${SHELL} won't
+	# work because the command is interpreted _before_ the SHELL is
+	# set. And this does not work properly as a standard sh script.
+	SHELL=/bin/bash prefix="${D}" bash ./Build || die
+}
+
+src_install() {
+	doman di.1
+	dobin di || die
+	dosym di /usr/bin/mi
+	dodoc README
+}