Install libdialog (#266065), link dialog with it. Convert to EAPI2. Remove old versions.

Package-Manager: portage-2.2_rc30/cvs/Linux i686

7 files changed, 128 insertions, 122 deletions

diff --git a/dev-util/dialog/ChangeLog b/dev-util/dialog/ChangeLog
index 34d7c549d4b7..2ec25d142a27 100644
--- a/dev-util/dialog/ChangeLog
+++ b/dev-util/dialog/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/dialog
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.121 2009/03/18 15:00:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.122 2009/04/14 20:55:20 truedfx Exp $
+
+*dialog-1.1.20080819-r1 (14 Apr 2009)
+
+  14 Apr 2009; Harald van Dijk <truedfx@gentoo.org>
+  +files/dialog-shared.patch, metadata.xml, -dialog-1.1.20070930.ebuild,
+  -dialog-1.1.20071028.ebuild, -dialog-1.1.20080727.ebuild,
+  +dialog-1.1.20080819-r1.ebuild:
+  Install libdialog (#266065), link dialog with it. Convert to EAPI2. Remove
+  old versions.
 
   18 Mar 2009; Brent Baude <ranger@gentoo.org> dialog-1.1.20080819.ebuild:
   stable ppc, bug 259919
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index f5925719c574..399d9898492e 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,15 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dialog-mkdirs.patch 551 RMD160 5c39e4d96210e5265fe3603b1915ab2c5633c613 SHA1 ffcbc8c50891dce7d466b0f2ae46100891a5e060 SHA256 570eb3f040afa05951e2d9f481528bf0e27e98e10c20afb70fe9ccf936bb00dc
+AUX dialog-shared.patch 2631 RMD160 628182f27964e3d6f14fa62528052f807a7d76ac SHA1 3dad7066faeff9bf040bc0c0b096097aaaab5a9d SHA256 79481e6a70495031f6db501c2d752e67fbbdbd09081b3b09dce0fdc2989d73d8
 DIST dialog-1.1-20070704.tgz 367588 RMD160 88487908ffd621a567d8ab6a601526b34411048e SHA1 af12f3d9872e1fd85cd7e9529335269648dd21c2 SHA256 b209880eace208758be5789ee213e60e999e5c6bf6aed739f6076c93cf8f6f2b
-DIST dialog-1.1-20070930.tgz 369743 RMD160 7df4c655ab4120d81447dbca3fb13e2d3906f152 SHA1 3ef01286da60961be51dcf735af8f4129225e6ad SHA256 20f0e2b1463b7d54f986bd4995949effbead8ad9555d540ef9c0961ead7e8346
-DIST dialog-1.1-20071028.tgz 369837 RMD160 d3ab49bfb3a16a106f219689f4a513eb6a02e892 SHA1 1d290e3c3fb38403fc183ced29b4faae4491169f SHA256 1841fdd89c1d680c11ea854bc2ea93a08c80ba066d74a5faeb3ff76409e6e751
 DIST dialog-1.1-20080316.tgz 373022 RMD160 dbc2ec18fb181ca3be6fa92be0429fb2b1b2b2b1 SHA1 de136626fd4f3edf75b3997d75bb9bf151eb39f0 SHA256 bd11acbc57442930160dbbcea2d5024a27c71774c24412c44b9cdece9894e707
-DIST dialog-1.1-20080727.tgz 378244 RMD160 3e07b8963aa22ec2f8222aac5bdf214c38d0ca7e SHA1 f26d70510babaa7be8eb0b0842fd5666f8c7b0fe SHA256 6dcba632c127929e0ca85c57d2af2040c16c38727a71175de390e1942b8cb447
 DIST dialog-1.1-20080819.tgz 378814 RMD160 c7e2ad63ccffb4a042a61e59dcc44e5c1e9a94b0 SHA1 068a46aa1ffbfe96fdbf5cedd480b795a4f6321a SHA256 c5d49b39c5998bcecd124c05cc6f096d22ccdc378ad455214611ae41a2f4b7d9
 EBUILD dialog-1.1.20070704.ebuild 1374 RMD160 e5dcf1bcf81ea7be80dd54863feadfa6b7a2acd5 SHA1 dd7ebac40bc8fa9d3d137f9809ef19793121eafb SHA256 178d1d52d265472ed12e5d72a485d9081c742547a10ea50bacb58aeecd703bcb
-EBUILD dialog-1.1.20070930.ebuild 1453 RMD160 55196faaae735a687f08910c8cda89a9f44dd6a1 SHA1 286e7113261f1e9364c2efd92769feec5018c1d8 SHA256 209099140993a9cf597768a6f6a17446d23a9b08267a4f52f523ec6c88832f75
-EBUILD dialog-1.1.20071028.ebuild 1448 RMD160 9b02ca969f205970a4783014b55b37182c205c89 SHA1 b22b92549f3b52a38b5b3efdbb0ff58560a52085 SHA256 f0ebd60b4f93c875964486f713dcf15c7f53e2e9d52a0d99d8293ed790c8a78a
 EBUILD dialog-1.1.20080316.ebuild 1452 RMD160 437d0a77255ced236d8b07b8cc424565eceb4e6f SHA1 99cacddb065e6a0cea148e51f2fd1ee5b5f5bdf8 SHA256 d1d62f3f6fd49c796a67aad661d030baad6644df6fdc3eaf99bde0ef5ea116d9
-EBUILD dialog-1.1.20080727.ebuild 1463 RMD160 12ca9fbf4bb5f69298cd63c28be2f0707d9acc69 SHA1 2a7fd9287c853f3a9eb58c7205cf197792369cae SHA256 9aa21d03911e244f8784c8e78ecfdc8b5dfab37d3a96892ef35b1db47eea8209
+EBUILD dialog-1.1.20080819-r1.ebuild 1307 RMD160 319a71e1979f0960f9d5307275cf41dfaff154da SHA1 982b0a0e262565168fb8d98d217c65a9a42e1704 SHA256 ef39b1482b46b2f444819c2e81b2d939f670be639eef0c48357a7e83a94ac36a
 EBUILD dialog-1.1.20080819.ebuild 1451 RMD160 7a85fa4d20e0e018025b122e13bf3a2bd0e8c4cb SHA1 c1ad835a82b47ed978e9df36b7f68bc839942934 SHA256 f4d95dabdd32875c6c32a05f06c9cae2ac3a9df33c6f38ee0d2d8e6b2aa6e039
-MISC ChangeLog 16381 RMD160 62a2cfd720eea27f807088da56d4ed87c4f5d68f SHA1 35fca8670ebe50ec0f7a89a7133d6fd4af93feea SHA256 610cebde4a47cdab6fc9f923d6895eca73326aaa3b46f453a9e44a200814f0af
-MISC metadata.xml 250 RMD160 61af8ec7e1bf9941d107eff4cc6a639874a6f198 SHA1 7ea68a3bd071637e4a49b61b2f7e35f3277545ef SHA256 aec181c304bce77cce8f1dc110e0203bc06b7c524ab40b1aac19a6f72aefdfde
+MISC ChangeLog 16734 RMD160 ba6662e21756c57eba9a1e7217cfcc9f78440ba5 SHA1 085a598eb19991eff079201ecb297ec88f7f1953 SHA256 fc66a2af3e5edbe4640a279542810590c1347f5b22942a7e505c723b6e1bbddc
+MISC metadata.xml 342 RMD160 5fc9ab35cabea23dc16c838374598452187226d7 SHA1 0398ccb7210e331231fe39738bd61987ca29ddd0 SHA256 964a101183691deb766af500f09d4c0d3281896c316839bd54fb2a094fc6396c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknk+EoACgkQwnQyISwouHzSQgCdGY8LPNMHeSrEzbYHpckUP9Fo
+c9wAoLu765f6xkEXGHVvVjmmAb5ZHTJ8
+=rKYc
+-----END PGP SIGNATURE-----
diff --git a/dev-util/dialog/dialog-1.1.20070930.ebuild b/dev-util/dialog/dialog-1.1.20070930.ebuild
deleted file mode 100644
index 361408c7c92b..000000000000
--- a/dev-util/dialog/dialog-1.1.20070930.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20070930.ebuild,v 1.5 2007/12/11 16:48:52 vapier Exp $
-
-inherit eutils
-
-MY_PV="${PV/1.1./1.1-}"
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
-SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="examples nls unicode"
-
-RDEPEND=">=app-shells/bash-2.04-r3
-	>=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
-		eerror "Installing dialog with the unicode flag requires ncurses be"
-		eerror "built with it as well. Please make sure your /etc/make.conf"
-		eerror "or /etc/portage/package.use enables it, and re-install"
-		eerror "ncurses with \`emerge --oneshot sys-libs/ncurses\`."
-		die "Re-emerge ncurses with the unicode flag"
-	fi
-}
-
-src_compile() {
-	use unicode && ncursesw="w"
-	econf $(use_enable nls) \
-		"--with-ncurses${ncursesw}" || die "configure failed"
-	emake || die "build failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc CHANGES README VERSION
-
-	if use examples; then
-		docinto samples
-		dodoc samples/*
-	fi
-}
diff --git a/dev-util/dialog/dialog-1.1.20071028.ebuild b/dev-util/dialog/dialog-1.1.20071028.ebuild
deleted file mode 100644
index eca4f2e47292..000000000000
--- a/dev-util/dialog/dialog-1.1.20071028.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20071028.ebuild,v 1.7 2008/03/22 16:29:39 drac Exp $
-
-inherit eutils
-
-MY_PV="${PV/1.1./1.1-}"
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
-SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="examples nls unicode"
-
-RDEPEND=">=app-shells/bash-2.04-r3
-	>=sys-libs/ncurses-5.2-r5"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
-		eerror "Installing dialog with the unicode flag requires ncurses be"
-		eerror "built with it as well. Please make sure your /etc/make.conf"
-		eerror "or /etc/portage/package.use enables it, and re-install"
-		eerror "ncurses with \`emerge --oneshot sys-libs/ncurses\`."
-		die "Re-emerge ncurses with the unicode flag"
-	fi
-}
-
-src_compile() {
-	use unicode && ncursesw="w"
-	econf $(use_enable nls) \
-		"--with-ncurses${ncursesw}" || die "configure failed"
-	emake || die "build failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc CHANGES README VERSION
-
-	if use examples; then
-		docinto samples
-		dodoc samples/*
-	fi
-}
diff --git a/dev-util/dialog/dialog-1.1.20080727.ebuild b/dev-util/dialog/dialog-1.1.20080819-r1.ebuild
index 93a78d056716..7a55acb1e745 100644
--- a/dev-util/dialog/dialog-1.1.20080727.ebuild
+++ b/dev-util/dialog/dialog-1.1.20080819-r1.ebuild
@@ -1,6 +1,8 @@
-# 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/dev-util/dialog/dialog-1.1.20080727.ebuild,v 1.1 2008/08/18 21:03:52 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20080819-r1.ebuild,v 1.1 2009/04/14 20:55:20 truedfx Exp $
+
+EAPI=2
 
 inherit eutils
 
@@ -13,32 +15,34 @@ SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="examples nls unicode"
+IUSE="examples minimal nls unicode"
 
 RDEPEND=">=app-shells/bash-2.04-r3
-	>=sys-libs/ncurses-5.2-r5"
+	!unicode? ( >=sys-libs/ncurses-5.2-r5 )
+	unicode? ( >=sys-libs/ncurses-5.2-r5[unicode] )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-pkg_setup() {
-	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
-		eerror "Installing dialog with the unicode flag requires ncurses be"
-		eerror "built with it as well. Please make sure your /etc/make.conf"
-		eerror "or /etc/portage/package.use enables it, and re-install"
-		eerror "ncurses with \`emerge --oneshot sys-libs/ncurses\`."
-		die "Re-emerge ncurses with the unicode flag"
-	fi
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-shared.patch
 }
 
-src_compile() {
+src_configure() {
+	local ncursesw
 	use unicode && ncursesw="w"
-	econf $(use_enable nls) \
-		"--with-ncurses${ncursesw}" || die "configure failed"
-	emake || die "build failed"
+	econf \
+		$(use_enable nls) \
+		$(use_with !minimal libtool) \
+		--with-ncurses${ncursesw}
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	if use minimal; then
+		emake DESTDIR="${D}" install || die "install failed"
+	else
+		emake DESTDIR="${D}" install-full || die "install failed"
+	fi
+
 	dodoc CHANGES README VERSION
 
 	if use examples; then
diff --git a/dev-util/dialog/files/dialog-shared.patch b/dev-util/dialog/files/dialog-shared.patch
new file mode 100644
index 000000000000..9e58ba48a49d
--- /dev/null
+++ b/dev-util/dialog/files/dialog-shared.patch
@@ -0,0 +1,80 @@
+--- dialog-1.1-20080819/aclocal.m4
++++ dialog-1.1-20080819/aclocal.m4
+@@ -3037,6 +3037,7 @@
+ ])
+ # common library maintenance symbols that are convenient for libtool scripts:
+ LIB_CREATE='${AR} -cr'
++LIB_LIBS=''
+ LIB_OBJECT='${OBJECTS}'
+ LIB_SUFFIX=.a
+ LIB_PREP="$RANLIB"
+@@ -3071,7 +3072,8 @@
+  		AC_MSG_ERROR(Cannot find libtool)
+  	fi
+ ])dnl
+-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LDFLAGS} -o'
++	LIB_LIBS='$(LIBS)'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+@@ -3114,6 +3116,7 @@
+ AC_SUBST(LIBTOOL_OPTS)
+ 
+ AC_SUBST(LIB_CREATE)
++AC_SUBST(LIB_LIBS)
+ AC_SUBST(LIB_OBJECT)
+ AC_SUBST(LIB_SUFFIX)
+ AC_SUBST(LIB_PREP)
+--- dialog-1.1-20080819/configure
++++ dialog-1.1-20080819/configure
+@@ -7113,6 +7113,7 @@
+ 
+ # common library maintenance symbols that are convenient for libtool scripts:
+ LIB_CREATE='${AR} -cr'
++LIB_LIBS=''
+ LIB_OBJECT='${OBJECTS}'
+ LIB_SUFFIX=.a
+ LIB_PREP="$RANLIB"
+@@ -7217,7 +7218,8 @@
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+  	fi
+-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LDFLAGS} -o'
++	LIB_LIBS='$(LIBS)'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+@@ -11460,6 +11462,7 @@
+ s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
+ s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
+ s,@LIB_CREATE@,$LIB_CREATE,;t t
++s,@LIB_LIBS@,$LIB_LIBS,;t t
+ s,@LIB_OBJECT@,$LIB_OBJECT,;t t
+ s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
+ s,@LIB_PREP@,$LIB_PREP,;t t
+--- dialog-1.1-20080819/makefile.in
++++ dialog-1.1-20080819/makefile.in
+@@ -51,6 +51,7 @@
+ LIBTOOL_CLEAN	= @LIB_CLEAN@
+ LIBTOOL_COMPILE	= @LIB_COMPILE@
+ LIBTOOL_CREATE	= @LIB_CREATE@
++LIBTOOL_LIBS	= @LIB_LIBS@
+ LIBTOOL_LINK	= @LIB_LINK@
+ LIBTOOL_INSTALL	= @LIB_INSTALL@
+ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
+@@ -125,11 +126,11 @@
+ $(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
+ 
+ $(LIB) : $(LIB_OBJECT)
+-	$(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
++	$(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBTOOL_LIBS)
+ 	$(RANLIB) $@
+ 
+ dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
+-	$(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS) $(LIBS)
++	$(LINK) $(LDFLAGS) -o $@ dialog$o -L. -ldialog $(LIBS)
+ 
+ clean	\
+ distclean \
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
index c66b7883ddfe..3788b7c3c202 100644
--- a/dev-util/dialog/metadata.xml
+++ b/dev-util/dialog/metadata.xml
@@ -6,4 +6,7 @@
 <email>truedfx@gentoo.org</email>
 <name>Harald van Dijk</name>
 </maintainer>
+<use>
+<flag name="minimal">Disable library, install command-line program only</flag>
+</use>
 </pkgmetadata>