Because ncurses5-config --terminfo returns /usr/share/terminfo we keepdir it wrt #245374 and can drop USE -minimal depend.

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

4 files changed, 43 insertions, 49 deletions

diff --git a/sys-libs/slang/ChangeLog b/sys-libs/slang/ChangeLog
index e4d85d682c3c..f93c4530137e 100644
--- a/sys-libs/slang/ChangeLog
+++ b/sys-libs/slang/ChangeLog
@@ -1,22 +1,27 @@
 # ChangeLog for sys-libs/slang
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.93 2008/11/03 01:47:54 matsuu Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v 1.94 2009/04/29 22:24:08 ssuominen Exp $
+
+  30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild,
+  slang-2.1.4.ebuild:
+  Because ncurses5-config --terminfo returns /usr/share/terminfo we keepdir
+  it wrt #245374 and drop USE -minimal depend.
 
 *slang-2.1.4 (03 Nov 2008)
 
   03 Nov 2008; MATSUU Takuto <matsuu@gentoo.org> +slang-2.1.4.ebuild:
   Version bumped, bug #237144. Added EAPI=2.
 
-  12 Jun 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  12 Jun 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   arm stable
 
-  29 May 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  29 May 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   keyword ~arm
 
-  04 Apr 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  04 Apr 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   Keyword ~sparc-fbsd, thanks to Uberlord for testing.
 
-  19 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  19 Mar 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/slang-2.1.3-uclibc.patch, slang-2.1.3-r1.ebuild:
   Fix a regression from slang-1.4.9-r2, building on uclibc wrt bug 213925
   thanks to Natanael Copa.
@@ -30,7 +35,7 @@
   11 Mar 2008; Brent Baude <ranger@gentoo.org> slang-2.1.3-r1.ebuild:
   stable ppc64, bug 211986
 
-  10 Mar 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  10 Mar 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   amd64 stable wrt #211986
 
   10 Mar 2008; Raúl Porcel <armin76@gentoo.org> slang-2.1.3-r1.ebuild:
@@ -45,11 +50,11 @@
   17 Feb 2008; Alexis Ballier <aballier@gentoo.org> slang-2.1.3-r1.ebuild:
   keyword ~x86-fbsd
 
-  15 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  15 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   If USE readline is used, and it's enabled by default in profiles use system
   readline for slsh instead of native slang.
 
-  15 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
+  15 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
   sys-libs/ncurses is required for /usr/share/terminfo files which means it
   cannot be built with USE minimal wrt #210063 by Saul Peebsen.
 
@@ -59,9 +64,8 @@
   11 Feb 2008; Raúl Porcel <armin76@gentoo.org> slang-2.1.3-r1.ebuild:
   Re-add ~ia64/~sparc
 
-  11 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3-r1.ebuild:
-  Force -j1 for both building and installing wrt #209643, but it fails in many
-  different ways.
+  11 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3-r1.ebuild:
+  Force -j1 for both building and installing wrt #209643.
 
   11 Feb 2008; Brent Baude <ranger@gentoo.org> slang-2.1.3-r1.ebuild:
   Marking slang-2.1.3-r1 ~ppc64 for bug 209422
@@ -71,10 +75,10 @@
 
 *slang-2.1.3-r1 (10 Feb 2008)
 
-  10 Feb 2008; Samuli Suominen <drac@gentoo.org> +slang-2.1.3-r1.ebuild:
+  10 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> +slang-2.1.3-r1.ebuild:
   USE cjk for optional dev-libs/oniguruma dep.
 
-  10 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-2.1.3.ebuild:
+  10 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> slang-2.1.3.ebuild:
   Use targets elf and static in src_compile and install-all in src_install to
   avoid compiling at install phase.
 
@@ -87,13 +91,13 @@
   09 Feb 2008; Brent Baude <ranger@gentoo.org> slang-2.1.3.ebuild:
   keyworded ~arch for ppc64, bug 209434
 
-  09 Feb 2008; Samuli Suominen <drac@gentoo.org> slang-1.4.9-r2.ebuild,
+  09 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> slang-1.4.9-r2.ebuild,
   -slang-2.1.2.ebuild:
   Remove unused version and fix quoting of stable.
 
 *slang-2.1.3 (09 Feb 2008)
 
-  09 Feb 2008; Samuli Suominen <drac@gentoo.org> +slang-2.1.3.ebuild:
+  09 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> +slang-2.1.3.ebuild:
   Version bump wrt #202344, thanks to Arfrever Frehtes Taifersar Arahesis for
   reporting.
 
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 201196e66871..920074559287 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -2,7 +2,7 @@ AUX slang-2.1.2-slsh-libs.patch 637 RMD160 0c8b60cf026ab7fc5ad079f04766b907325ed
 AUX slang-2.1.3-uclibc.patch 494 RMD160 28ce3d06e5554697bf90f4991128820b19aba11e SHA1 a09a554c6166d81e223a77edc629a19bb8bf0b53 SHA256 7b88890ae8787617065d693f0469b2d462148964e3de9d74e28c0b202590fd69
 DIST slang-2.1.3.tar.bz2 1191425 RMD160 b59424972e52c361a15b23874d1a0539683608e5 SHA1 31fc6162684f69d9dd0377372dfdc336f0c4343a SHA256 534b80d31f582a00163c2abdcc0317585fa06918c96af65d008718f3b68fddfc
 DIST slang-2.1.4.tar.bz2 1283938 RMD160 394d6b6d4d770b6f006355772c159aa6ad5cde79 SHA1 8670420f870f3f5b92e72ec5962aefa52fd546a5 SHA256 944e7123a3889f1e972f77c7cd46e2e98f7f8d02d25c585f1276c9c9307161a6
-EBUILD slang-2.1.3-r1.ebuild 1634 RMD160 645e8d6a2736964db8c165f6632e25c7584397f9 SHA1 cacf041d7bef9d5b09b44177461506462a5a1203 SHA256 0b8d3854cd45595355fbeb684957adb0ec0e33b35f6e5c84495ed8ef8bc84056
-EBUILD slang-2.1.4.ebuild 1547 RMD160 c32ba8b7313cfbe5010a58a4a0b835f39440f362 SHA1 5bdff23cb0e1b349ec354a11f5feeddea4690627 SHA256 2bfaa66c3ea6cafe04699105401832974be485a771ef26d54f0dce9e478fcaf3
-MISC ChangeLog 12362 RMD160 e06ab2b9935ce21d0c304b5d52a5f088cc2f8a66 SHA1 15547c699ea5bcceebfa8b69332664d8e2eb179d SHA256 662887954a1996f7eccb67d9dfbc5acb8508741f07e4b1b6a26ae3b440cb8b69
+EBUILD slang-2.1.3-r1.ebuild 1440 RMD160 a57f5620972fdedb01f9d4c22623b313d2943a00 SHA1 77dcb812ec4036c7029d7c668dd5ce057be8f333 SHA256 2a1e0c9f34770b456705ee61cabd5ce3d15f2bc5a9163cc9ff88fb29c5deb108
+EBUILD slang-2.1.4.ebuild 1486 RMD160 1a3ab5e5b9628e45ec014b8db28605c94499597c SHA1 593a4fcd451ce55128e5a01f5eda5f5f65c6d5ae SHA256 34fb62fbdbaeaf149ef76d8904ac085ee1d5e09c10727d8fbb5560423c265ec3
+MISC ChangeLog 12609 RMD160 fb894d82a35aa69fc032225a79bb9d305311f55e SHA1 7c54d64f59ef643c7e73d0ceecb5fdcc55fc8db1 SHA256 877455a1d67f34d331f9a792ccd1dbde0152d18838f227e11882298891d09b9b
 MISC metadata.xml 157 RMD160 1305e8c09c6d49c0db2a18bb50b045460c124ebe SHA1 874689ae30dfe223d487e0e6a5e0a0dbf06a69f4 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d
diff --git a/sys-libs/slang/slang-2.1.3-r1.ebuild b/sys-libs/slang/slang-2.1.3-r1.ebuild
index 5d8654fa9362..d3b62eb164a5 100644
--- a/sys-libs/slang/slang-2.1.3-r1.ebuild
+++ b/sys-libs/slang/slang-2.1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild,v 1.20 2008/06/13 05:30:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild,v 1.21 2009/04/29 22:24:08 ssuominen Exp $
 
 inherit eutils
 
@@ -18,22 +18,13 @@ RDEPEND="sys-libs/ncurses
 	png? ( media-libs/libpng )
 	cjk? ( dev-libs/oniguruma )
 	readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	!=sys-libs/slang-2.1.2"
-
-pkg_setup() {
-	local fail="Re-emerge sys-libs/ncurses with USE -minimal."
-	if built_with_use sys-libs/ncurses minimal; then
-		eerror "${fail}"
-		die "${fail}"
-	fi
-}
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.1.2-slsh-libs.patch
-	epatch "${FILESDIR}"/${P}-uclibc.patch
+	epatch "${FILESDIR}"/${PN}-2.1.2-slsh-libs.patch \
+		"${FILESDIR}"/${P}-uclibc.patch
 }
 
 src_compile() {
@@ -48,14 +39,14 @@ src_compile() {
 	econf $(use_with cjk onig) $(use_with pcre) $(use_with png) \
 		--with-readline=${readline}
 
-	emake -j1 elf static || die "emake elf static failed."
+	emake -j1 elf static || die "emake elf static failed"
 
 	cd slsh
-	emake -j1 slsh || die "emake slsh failed."
+	emake -j1 slsh || die "emake slsh failed"
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install-all || die "emake install-all failed."
+	emake -j1 DESTDIR="${D}" install-all || die "emake install-all failed"
 
 	rm -rf "${D}"/usr/share/doc/{slang,slsh}
 
diff --git a/sys-libs/slang/slang-2.1.4.ebuild b/sys-libs/slang/slang-2.1.4.ebuild
index d29056700e98..3399830682a9 100644
--- a/sys-libs/slang/slang-2.1.4.ebuild
+++ b/sys-libs/slang/slang-2.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.4.ebuild,v 1.1 2008/11/03 01:47:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.4.ebuild,v 1.2 2009/04/29 22:24:08 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -14,44 +14,43 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="cjk pcre png readline"
 
-RDEPEND="sys-libs/ncurses[-minimal]
+RDEPEND="sys-libs/ncurses
 	pcre? ( dev-libs/libpcre )
 	png? ( media-libs/libpng )
 	cjk? ( dev-libs/oniguruma )
 	readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	!=sys-libs/slang-2.1.2"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.2-slsh-libs.patch
-	epatch "${FILESDIR}"/${PN}-2.1.3-uclibc.patch
+	epatch "${FILESDIR}"/${PN}-2.1.2-slsh-libs.patch \
+		"${FILESDIR}"/${PN}-2.1.3-uclibc.patch
 }
 
 src_configure() {
 	local myconf
 
 	if use readline; then
-		myconf="${myconf} --with-readline=gnu"
+		myconf+=" --with-readline=gnu"
 	else
-		myconf="${myconf} --with-readline=slang"
+		myconf+=" --with-readline=slang"
 	fi
 
 	econf \
 		$(use_with cjk onig) \
 		$(use_with pcre) \
 		$(use_with png) \
-		${myconf} || die
+		${myconf}
 }
 
 src_compile() {
-	emake -j1 elf static || die "emake elf static failed."
+	emake -j1 elf static || die "emake elf static failed"
 
 	cd slsh
-	emake -j1 slsh || die "emake slsh failed."
+	emake -j1 slsh || die "emake slsh failed"
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install-all || die "emake install-all failed."
+	emake -j1 DESTDIR="${D}" install-all || die "emake install-all failed"
 
 	rm -rf "${D}"/usr/share/doc/{slang,slsh}