[gentoo-commits] gentoo-x86 commit in sys-libs/slang: slang-2.1.4.ebuild ChangeLog slang-2.1.3-r1.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    09/04/29 22:24:08

  Modified:             slang-2.1.4.ebuild ChangeLog slang-2.1.3-r1.ebuild
  Log:
  Because ncurses5-config --terminfo returns /usr/share/terminfo we keepdir it wrt #245374 and can drop USE -minimal depend.
  (Portage version: 2.1.6.11/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-libs/slang/slang-2.1.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/slang/slang-2.1.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/slang/slang-2.1.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/slang/slang-2.1.4.ebuild?r1=1.1&r2=1.2

Index: slang-2.1.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slang-2.1.4.ebuild	3 Nov 2008 01:47:54 -0000	1.1
+++ slang-2.1.4.ebuild	29 Apr 2009 22:24:08 -0000	1.2
@@ -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 @@
 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}
 



1.94                 sys-libs/slang/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/slang/ChangeLog?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/slang/ChangeLog?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/slang/ChangeLog?r1=1.93&r2=1.94

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/slang/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ChangeLog	3 Nov 2008 01:47:54 -0000	1.93
+++ ChangeLog	29 Apr 2009 22:24:08 -0000	1.94
@@ -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@g.o> 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@g.o> +slang-2.1.4.ebuild:
   Version bumped, bug #237144. Added EAPI=2.
 
-  12 Jun 2008; Samuli Suominen <drac@g.o> slang-2.1.3-r1.ebuild:
+  12 Jun 2008; Samuli Suominen <ssuominen@g.o> slang-2.1.3-r1.ebuild:
   arm stable
 
-  29 May 2008; Samuli Suominen <drac@g.o> slang-2.1.3-r1.ebuild:
+  29 May 2008; Samuli Suominen <ssuominen@g.o> slang-2.1.3-r1.ebuild:
   keyword ~arm
 
-  04 Apr 2008; Samuli Suominen <drac@g.o> slang-2.1.3-r1.ebuild:
+  04 Apr 2008; Samuli Suominen <ssuominen@g.o> slang-2.1.3-r1.ebuild:
   Keyword ~sparc-fbsd, thanks to Uberlord for testing.
 
-  19 Mar 2008; Samuli Suominen <drac@g.o>
+  19 Mar 2008; Samuli Suominen <ssuominen@g.o>
   +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@g.o> slang-2.1.3-r1.ebuild:
   stable ppc64, bug 211986
 
-  10 Mar 2008; Samuli Suominen <drac@g.o> slang-2.1.3-r1.ebuild:
+  10 Mar 2008; Samuli Suominen <ssuominen@g.o> slang-2.1.3-r1.ebuild:
   amd64 stable wrt #211986
 
   10 Mar 2008; Raúl Porcel <armin76@g.o> slang-2.1.3-r1.ebuild:
@@ -45,11 +50,11 @@
   17 Feb 2008; Alexis Ballier <aballier@g.o> slang-2.1.3-r1.ebuild:
   keyword ~x86-fbsd
 
-  15 Feb 2008; Samuli Suominen <drac@g.o> slang-2.1.3-r1.ebuild:
+  15 Feb 2008; Samuli Suominen <ssuominen@g.o> 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@g.o> slang-2.1.3-r1.ebuild:
+  15 Feb 2008; Samuli Suominen <ssuominen@g.o> 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@g.o> slang-2.1.3-r1.ebuild:
   Re-add ~ia64/~sparc
 
-  11 Feb 2008; Samuli Suominen <drac@g.o> 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@g.o> slang-2.1.3-r1.ebuild:
+  Force -j1 for both building and installing wrt #209643.
 
   11 Feb 2008; Brent Baude <ranger@g.o> 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@g.o> +slang-2.1.3-r1.ebuild:
+  10 Feb 2008; Samuli Suominen <ssuominen@g.o> +slang-2.1.3-r1.ebuild:
   USE cjk for optional dev-libs/oniguruma dep.
 
-  10 Feb 2008; Samuli Suominen <drac@g.o> slang-2.1.3.ebuild:
+  10 Feb 2008; Samuli Suominen <ssuominen@g.o> 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@g.o> slang-2.1.3.ebuild:
   keyworded ~arch for ppc64, bug 209434
 
-  09 Feb 2008; Samuli Suominen <drac@g.o> slang-1.4.9-r2.ebuild,
+  09 Feb 2008; Samuli Suominen <ssuominen@g.o> 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@g.o> +slang-2.1.3.ebuild:
+  09 Feb 2008; Samuli Suominen <ssuominen@g.o> +slang-2.1.3.ebuild:
   Version bump wrt #202344, thanks to Arfrever Frehtes Taifersar Arahesis for
   reporting.
 



1.21                 sys-libs/slang/slang-2.1.3-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild?r1=1.20&r2=1.21

Index: slang-2.1.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-2.1.3-r1.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- slang-2.1.3-r1.ebuild	13 Jun 2008 05:30:44 -0000	1.20
+++ slang-2.1.3-r1.ebuild	29 Apr 2009 22:24:08 -0000	1.21
@@ -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 @@
 	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 @@
 	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}