Upgraded the dialog Portage package

Upgraded dev-util/dialog to version 1.1.20100428 on arm, x86

BUG=chromium-os:21257
TEST=alsa-util uses this library, test alsa-mixer on Kaen and ZGB.
testbot: x86-generic-pre-flight-queue

Change-Id: I3971efb17cc98f034a47fe18e23a66f71d2e6641
Reviewed-on: http://gerrit.chromium.org/gerrit/9774
Tested-by: Dylan Reid <dgreid@chromium.org>
Commit-Ready: Dylan Reid <dgreid@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
This commit is contained in:
Dylan Reid 2011-10-09 23:25:06 -07:00
parent ac691c49c6
commit cf4a261523
2 changed files with 133 additions and 0 deletions

View File

@ -0,0 +1,53 @@
# 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
}

View File

@ -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 \