Semi auto-sync

(manually editted for 2m 37s) -- dev-util/dialog (2009-04-15 18:47:37.182384628 +0200)
(Portage version: 2.2.00.13286-prefix/svn/SunOS i386)

7 files changed, 75 insertions, 173 deletions

diff --git a/dev-util/dialog/ChangeLog b/dev-util/dialog/ChangeLog
index 34d7c549d4..2ec25d142a 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 fac010fcf0..faae1ce275 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,16 +1,11 @@
 AUX dialog-1.1-no-usr-local.patch 6031 RMD160 e84f056285cd0c8927b2b5103d564adbfe09ebea SHA1 fd28dfba5c82127c84aadf7d188c7907e810d81f SHA256 a489e148706fd26bd73cc8aa3a7c0519ddc5cecd5c07a85f76e0436233146678
 AUX dialog-mkdirs.patch 551 RMD160 5c39e4d96210e5265fe3603b1915ab2c5633c613 SHA1 ffcbc8c50891dce7d466b0f2ae46100891a5e060 SHA256 570eb3f040afa05951e2d9f481528bf0e27e98e10c20afb70fe9ccf936bb00dc
 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 1513 RMD160 6ef6067b76c20a457824265c21770f643b4a0196 SHA1 55a063b48e75c72e311fc60ca71779d84cdbd2eb SHA256 0a597b07f7829ac483da8fd824c66b0dedcda447cabc28c35134320863ef36e8
-EBUILD dialog-1.1.20070930.ebuild 1588 RMD160 e238bc23c10754a16becf60af9531864be9bccc0 SHA1 3bb642b7a461e537a9e00e9c51085ebed8cc80b1 SHA256 367e696ae59a5352da9b394f742c404c1e000e0ce41281963d19165086681a30
-EBUILD dialog-1.1.20071028.ebuild 1623 RMD160 16b7e746a1bf26df71241201b6b2393a80e6f0a3 SHA1 b59fd59eb4264d7415ca2d37c618018fdaa2aaca SHA256 abe8bbd1503c19b3edf3fd13ac2215d9d657bd63dd18643b2dd804da5c9ba858
 EBUILD dialog-1.1.20080316.ebuild 1796 RMD160 9f8b42c21ff401cdffbdf9d79850ebc04d191e49 SHA1 52b5f3e626d3ed02a96b4acc17e66f319cc371c7 SHA256 8a97ca7551d41b13295c94d037112a786d06184352398b9cb499718120ae8124
-EBUILD dialog-1.1.20080727.ebuild 1797 RMD160 8bf3ba9ca8f341260f5a9d78e6c1b500a3996a05 SHA1 12ac5c86558c5abeb1c2b5597e2afac563dd91f4 SHA256 dac67cec3aaf2e06a9910ed0b808f34cae89076d71ed5d9c07a523892c08e27e
+EBUILD dialog-1.1.20080819-r1.ebuild 1612 RMD160 1aeb08b61b0edc4e3cff6f98fe0f7795c6268290 SHA1 459b1480de034ed9c4247b0d9d8c077cc8d063a1 SHA256 974ddc0d12ef26c3a536ee99fcab83410adef4360aacf2a0661718f3ef31cda3
 EBUILD dialog-1.1.20080819.ebuild 1809 RMD160 9ab96c1d3448c85d1825b8e3279b6d654591cf33 SHA1 19c3070d90bab99c61162f94368be1fa80ae4fa3 SHA256 199384702bbebce6bdbea4ec3c6383f261accb5d87af1c836e348a340b56252f
-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
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 2979b32842..0000000000
--- a/dev-util/dialog/dialog-1.1.20070930.ebuild
+++ /dev/null
@@ -1,52 +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 $
-
-# porting note:
-# manpages were installed in the wrong location (double prefix)
-# solution: replaced make install with einstall
-
-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="~ppc-aix ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-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 9474053c75..0000000000
--- a/dev-util/dialog/dialog-1.1.20071028.ebuild
+++ /dev/null
@@ -1,52 +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 $
-
-# porting note:
-# manpages were installed in the wrong location (double prefix)
-# solution: replaced make install with einstall
-
-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="~ppc-aix ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-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.20080727.ebuild
deleted file mode 100644
index 03e83b46b5..0000000000
--- a/dev-util/dialog/dialog-1.1.20080727.ebuild
+++ /dev/null
@@ -1,60 +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.20080727.ebuild,v 1.1 2008/08/18 21:03:52 truedfx Exp $
-
-# porting note:
-# manpages were installed in the wrong location (double prefix)
-# solution: replaced make install with einstall
-
-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="~ppc-aix ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# configure searches all over the world for some things...
-	epatch "${FILESDIR}"/${PN}-1.1-no-usr-local.patch
-}
-
-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.20080819-r1.ebuild b/dev-util/dialog/dialog-1.1.20080819-r1.ebuild
new file mode 100644
index 0000000000..f15e196170
--- /dev/null
+++ b/dev-util/dialog/dialog-1.1.20080819-r1.ebuild
@@ -0,0 +1,59 @@
+# 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.20080819-r1.ebuild,v 1.1 2009/04/14 20:55:20 truedfx Exp $
+
+# porting note:
+# manpages were installed in the wrong location (double prefix)
+# solution: replaced make install with einstall
+
+EAPI=2
+
+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="~ppc-aix ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples minimal nls unicode"
+
+RDEPEND=">=app-shells/bash-2.04-r3
+	!unicode? ( >=sys-libs/ncurses-5.2-r5 )
+	unicode? ( >=sys-libs/ncurses-5.2-r5[unicode] )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-shared.patch
+	# configure searches all over the world for some things...
+	epatch "${FILESDIR}"/${PN}-1.1-no-usr-local.patch
+}
+
+src_configure() {
+	local ncursesw
+	use unicode && ncursesw="w"
+	econf \
+		$(use_enable nls) \
+		$(use_with !minimal libtool) \
+		--with-ncurses${ncursesw}
+}
+
+src_install() {
+	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
+		docinto samples
+		dodoc samples/*
+	fi
+}
diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml
index c66b7883dd..3788b7c3c2 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>