Version bump (#325747 by gionnico)

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 141 insertions, 63 deletions

diff --git a/dev-util/dialog/ChangeLog b/dev-util/dialog/ChangeLog
index 2ec25d142a27..b1ad8552c174 100644
--- a/dev-util/dialog/ChangeLog
+++ b/dev-util/dialog/ChangeLog
@@ -1,6 +1,13 @@
 # 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.122 2009/04/14 20:55:20 truedfx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.123 2010/07/07 22:22:36 truedfx Exp $
+
+*dialog-1.1.20100428 (07 Jul 2010)
+
+  07 Jul 2010; Harald van Dijk <truedfx@gentoo.org>
+  -dialog-1.1.20070704.ebuild, +dialog-1.1.20100428.ebuild,
+  +files/dialog-1.1.20100428-shared.patch, -files/dialog-mkdirs.patch:
+  Version bump (#325747 by gionnico)
 
 *dialog-1.1.20080819-r1 (14 Apr 2009)
 
diff --git a/dev-util/dialog/dialog-1.1.20070704.ebuild b/dev-util/dialog/dialog-1.1.20070704.ebuild
deleted file mode 100644
index 3e872cc33745..000000000000
--- a/dev-util/dialog/dialog-1.1.20070704.ebuild
+++ /dev/null
@@ -1,45 +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.20070704.ebuild,v 1.9 2007/11/25 02:59:09 ranger 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 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.20100428.ebuild b/dev-util/dialog/dialog-1.1.20100428.ebuild
new file mode 100644
index 000000000000..8ec42e069a86
--- /dev/null
+++ b/dev-util/dialog/dialog-1.1.20100428.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20100428.ebuild,v 1.1 2010/07/07 22:22:36 truedfx Exp $
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+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}"/${P}-shared.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/files/dialog-1.1.20100428-shared.patch b/dev-util/dialog/files/dialog-1.1.20100428-shared.patch
new file mode 100644
index 000000000000..adcd803e4417
--- /dev/null
+++ b/dev-util/dialog/files/dialog-1.1.20100428-shared.patch
@@ -0,0 +1,80 @@
+--- dialog-1.1-20100428/aclocal.m4
++++ dialog-1.1-20100428/aclocal.m4
+@@ -3460,6 +3460,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"
+@@ -3494,7 +3495,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} ${LT_UNDEF} -o'
++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} ${LDFLAGS} -o'
++	LIB_LIBS='$(LIBS)'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+@@ -3547,6 +3549,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-20100428/configure
++++ dialog-1.1-20100428/configure
+@@ -8305,6 +8305,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"
+@@ -8409,7 +8410,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} ${LT_UNDEF} -o'
++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} ${LDFLAGS} -o'
++	LIB_LIBS='$(LIBS)'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+@@ -13848,6 +13850,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-20100428/makefile.in
++++ dialog-1.1-20100428/makefile.in
+@@ -54,6 +54,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@
+@@ -140,11 +141,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/files/dialog-mkdirs.patch b/dev-util/dialog/files/dialog-mkdirs.patch
deleted file mode 100644
index 70bdcef40cae..000000000000
--- a/dev-util/dialog/files/dialog-mkdirs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- mkdirs.sh.orig	2007-03-19 16:28:39.000000000 +0100
-+++ mkdirs.sh	2007-03-19 16:28:56.000000000 +0100
-@@ -21,11 +21,11 @@
-      esac
- 
-      if test ! -d "$pathcomp"; then
--        echo "mkdir $pathcomp" 1>&2
-+        echo "mkdir -p $pathcomp" 1>&2
-         case "$pathcomp" in
-           [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
-                 ;;               # DOSISH systems
--          * )          mkdir "$pathcomp" || errstatus=$? ;;
-+          * )          mkdir -p "$pathcomp" || errstatus=$? ;;
-         esac
-      fi
-