diff options
author | Jeroen Roovers <jer@gentoo.org> | 2012-03-08 15:22:13 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2012-03-08 15:22:13 +0000 |
commit | 1268fbbddea6ab29d780719aaeebb162a97f6695 (patch) | |
tree | 8191be938581f3c058319f7a87e45166f503d313 /dev-util | |
parent | Marking minitest-2.6.2 ppc64 for bug 394781 (diff) | |
download | gentoo-2-1268fbbddea6ab29d780719aaeebb162a97f6695.tar.gz gentoo-2-1268fbbddea6ab29d780719aaeebb162a97f6695.tar.bz2 gentoo-2-1268fbbddea6ab29d780719aaeebb162a97f6695.zip |
Old.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/dialog/ChangeLog | 6 | ||||
-rw-r--r-- | dev-util/dialog/dialog-1.1.20100428.ebuild | 53 | ||||
-rw-r--r-- | dev-util/dialog/files/dialog-1.1.20100428-shared.patch | 80 | ||||
-rw-r--r-- | dev-util/dialog/files/dialog-shared.patch | 80 |
4 files changed, 5 insertions, 214 deletions
diff --git a/dev-util/dialog/ChangeLog b/dev-util/dialog/ChangeLog index c70f92582f95..f3ee3dfb4621 100644 --- a/dev-util/dialog/ChangeLog +++ b/dev-util/dialog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/dialog # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.149 2012/03/08 14:51:23 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/ChangeLog,v 1.150 2012/03/08 15:22:13 jer Exp $ + + 08 Mar 2012; Jeroen Roovers <jer@gentoo.org> -dialog-1.1.20100428.ebuild, + -files/dialog-1.1.20100428-shared.patch, -files/dialog-shared.patch: + Old. 08 Mar 2012; Brent Baude <ranger@gentoo.org> dialog-1.1.20110707-r1.ebuild: Marking dialog-1.1.20110707-r1 ppc64 for bug 396161 diff --git a/dev-util/dialog/dialog-1.1.20100428.ebuild b/dev-util/dialog/dialog-1.1.20100428.ebuild deleted file mode 100644 index dc2496801f05..000000000000 --- a/dev-util/dialog/dialog-1.1.20100428.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2011 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.10 2011/08/17 16:15:43 vapier 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 x86 ~sparc-fbsd ~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 ) - !minimal? ( sys-devel/libtool )" - -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 deleted file mode 100644 index adcd803e4417..000000000000 --- a/dev-util/dialog/files/dialog-1.1.20100428-shared.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- 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-shared.patch b/dev-util/dialog/files/dialog-shared.patch deleted file mode 100644 index 9e58ba48a49d..000000000000 --- a/dev-util/dialog/files/dialog-shared.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- 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 \ |