Semi auto-sync -- dev-util/dialog (2008-03-23 10:56:09.722760374 +0100)

(Portage version: 2.2.00.9494-prefix/svn/SunOS 5.10 i386)

5 files changed, 25 insertions, 71 deletions

diff --git a/dev-util/dialog/ChangeLog b/dev-util/dialog/ChangeLog
index 3daf332439..5c0b83c137 100644
--- a/dev-util/dialog/ChangeLog
+++ b/dev-util/dialog/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/dialog
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.107 2008/02/05 10:37:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.109 2008/03/22 16:29:39 drac Exp $
+
+  22 Mar 2008; Samuli Suominen <drac@gentoo.org> dialog-1.1.20071028.ebuild:
+  amd64 stable
+
+*dialog-1.1.20080316 (22 Mar 2008)
+
+  22 Mar 2008; Harald van Dijk <truedfx@gentoo.org>
+  -dialog-1.1.20070227.ebuild, -dialog-1.1.20070604.ebuild,
+  +dialog-1.1.20080316.ebuild:
+  Version bump (bug #214262), remove older versions
 
   05 Feb 2008; Markus Rothe <corsair@gentoo.org> dialog-1.1.20071028.ebuild:
   Stable on ppc64
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index d4737a647b..aef5dd21a9 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,12 +1,10 @@
 AUX dialog-mkdirs.patch 551 RMD160 5c39e4d96210e5265fe3603b1915ab2c5633c613 SHA1 ffcbc8c50891dce7d466b0f2ae46100891a5e060 SHA256 570eb3f040afa05951e2d9f481528bf0e27e98e10c20afb70fe9ccf936bb00dc
-DIST dialog-1.1-20070227.tgz 363972 RMD160 90a52a8016cf833863b9d590bb9de27b28d10a36 SHA1 c70c5d2c4544f5fd7a11a514b16eb5cd58b8cbc6 SHA256 e276e3a6c153ad9fbaf7658507a6cbb2e37cc957801eb3eb2d6423e53964eb2a
-DIST dialog-1.1-20070604.tgz 365939 RMD160 06bee856154f8c8804c9a8fc6f04df5e5b4a2cb4 SHA1 761a1de17a0608ced9f8a9c185820387082ec398 SHA256 aa89777d6e096917100bd54082cdac9ba6053b11d11e6b17d2dcd5279a0711fa
 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
-EBUILD dialog-1.1.20070227.ebuild 1619 RMD160 da76a2ec42c401970982660788d805a5b3095186 SHA1 63a083c5f90074545e5356bc5858ce8032b7374b SHA256 63635daa8e1939e9bfd3326e1e031be35c5d79624018e7197388407ee3606786
-EBUILD dialog-1.1.20070604.ebuild 1527 RMD160 89c9f4ea2609a634bfa3f4225e65b9b2e9c70a53 SHA1 7d06ca97668d55861242b754218fac0123f67d55 SHA256 a2690fc1427d1578ce8f8232833947bd02617b4175976255251c6f3845e4daa8
+DIST dialog-1.1-20080316.tgz 373022 RMD160 dbc2ec18fb181ca3be6fa92be0429fb2b1b2b2b1 SHA1 de136626fd4f3edf75b3997d75bb9bf151eb39f0 SHA256 bd11acbc57442930160dbbcea2d5024a27c71774c24412c44b9cdece9894e707
 EBUILD dialog-1.1.20070704.ebuild 1540 RMD160 c391bfa78e380f33b6ec231525f5a0d666ac3b57 SHA1 4333e35372c767902dedb57d813dc3c50d820379 SHA256 4fa41bcfc75b0cca93a744137e7cad2cb15b2c75ab5ba68bc5f811dbfa52ece4
 EBUILD dialog-1.1.20070930.ebuild 1615 RMD160 a3b582f9099308408e48fb29e6da9b039549bc2d SHA1 6e1765682cbe256e7ec208a9e21974d44499ac72 SHA256 5e1a21611b3fa46e9159ef2a774644292f5dbb52e902224662d270ff01e3bee6
-EBUILD dialog-1.1.20071028.ebuild 1653 RMD160 d2acf2b569de1781d8af72646939d0085d46439b SHA1 168a1a6057dd71bc566abdbb062f335c5061ebdf SHA256 24727dea67cd79a8ba7e511f43afe46c56cb5df2db1834623b585572f212c2bf
-MISC ChangeLog 14688 RMD160 d448a263251c545c39aad7f55a2750a9e1ae0115 SHA1 0e3ee59afa05ae89837a57acd61fc8ce0a1e4c3a SHA256 2104794badd4537f684c6780ad2acb2e71ea8f25090aed567a070a41a7792a62
+EBUILD dialog-1.1.20071028.ebuild 1650 RMD160 6a99b4897833a6691648907e8d67b3bc309f21f5 SHA1 ec4329961ee579133298db0ad37eb679851e5b16 SHA256 18696aa0207a40a86f4ba17fead1d7a726dfa525240485ca4916d1590f36ce50
+EBUILD dialog-1.1.20080316.ebuild 1653 RMD160 4a74245a4baa66c4257ad8d3ebbf16005b860372 SHA1 0476fd120c49d07016c7d232e34a6e6d9899f148 SHA256 654ad9fd9f735d4fd6433c5c4419193e4f6fa7a0e975813bfa25125a4bdda8d5
+MISC ChangeLog 15010 RMD160 8c699904edb74b68a44dc823ba264214b7bf24c0 SHA1 f65248c1cf8c6b245c6fca9a871a87856c421a96 SHA256 5330aa0e442d0ad9ced4cc5bc94ee03cbd30f9d03fdd5242f74f831c6d92e5d2
diff --git a/dev-util/dialog/dialog-1.1.20070604.ebuild b/dev-util/dialog/dialog-1.1.20070604.ebuild
deleted file mode 100644
index d120941c5a..0000000000
--- a/dev-util/dialog/dialog-1.1.20070604.ebuild
+++ /dev/null
@@ -1,51 +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.20070604.ebuild,v 1.5 2007/08/25 13:06:35 vapier Exp $
-
-EAPI="prefix"
-
-# 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 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples unicode"
-
-DEPEND=">=app-shells/bash-2.04-r3
-	>=sys-libs/ncurses-5.2-r5"
-
-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 "--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
index 846e177cf5..2da9bf2b1f 100644
--- a/dev-util/dialog/dialog-1.1.20071028.ebuild
+++ b/dev-util/dialog/dialog-1.1.20071028.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2008/02/05 10:37:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20071028.ebuild,v 1.7 2008/03/22 16:29:39 drac Exp $
 
 EAPI="prefix"
 
diff --git a/dev-util/dialog/dialog-1.1.20070227.ebuild b/dev-util/dialog/dialog-1.1.20080316.ebuild
index 4d3f8b63a8..8340604715 100644
--- a/dev-util/dialog/dialog-1.1.20070227.ebuild
+++ b/dev-util/dialog/dialog-1.1.20080316.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.20070227.ebuild,v 1.12 2007/08/25 22:59:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20080316.ebuild,v 1.1 2008/03/22 15:54:47 truedfx Exp $
 
 EAPI="prefix"
 
@@ -18,11 +18,13 @@ SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc-aix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples unicode"
+KEYWORDS="~ppc-aix ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples nls unicode"
 
-DEPEND=">=app-shells/bash-2.04-r3
+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
@@ -34,15 +36,10 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-mkdirs.patch #171348
-}
-
 src_compile() {
 	use unicode && ncursesw="w"
-	econf "--with-ncurses${ncursesw}" || die "configure failed"
+	econf $(use_enable nls) \
+		"--with-ncurses${ncursesw}" || die "configure failed"
 	emake || die "build failed"
 }