diff options
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/dialog/ChangeLog | 11 | ||||
-rw-r--r-- | dev-util/dialog/dialog-1.1.20070930.ebuild | 48 | ||||
-rw-r--r-- | dev-util/dialog/dialog-1.1.20071028.ebuild | 48 | ||||
-rw-r--r-- | dev-util/dialog/dialog-1.1.20080819-r1.ebuild (renamed from dev-util/dialog/dialog-1.1.20080727.ebuild) | 38 | ||||
-rw-r--r-- | dev-util/dialog/files/dialog-shared.patch | 80 | ||||
-rw-r--r-- | dev-util/dialog/metadata.xml | 3 |
6 files changed, 114 insertions, 114 deletions
diff --git a/dev-util/dialog/ChangeLog b/dev-util/dialog/ChangeLog index 34d7c549d4b7..2ec25d142a27 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/dialog-1.1.20070930.ebuild b/dev-util/dialog/dialog-1.1.20070930.ebuild deleted file mode 100644 index 361408c7c92b..000000000000 --- a/dev-util/dialog/dialog-1.1.20070930.ebuild +++ /dev/null @@ -1,48 +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 $ - -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 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 eca4f2e47292..000000000000 --- a/dev-util/dialog/dialog-1.1.20071028.ebuild +++ /dev/null @@ -1,48 +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 $ - -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 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.20080819-r1.ebuild index 93a78d056716..7a55acb1e745 100644 --- a/dev-util/dialog/dialog-1.1.20080727.ebuild +++ b/dev-util/dialog/dialog-1.1.20080819-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.20080727.ebuild,v 1.1 2008/08/18 21:03:52 truedfx Exp $ +# $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 $ + +EAPI=2 inherit eutils @@ -13,32 +15,34 @@ 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 nls unicode" +IUSE="examples minimal nls unicode" RDEPEND=">=app-shells/bash-2.04-r3 - >=sys-libs/ncurses-5.2-r5" + !unicode? ( >=sys-libs/ncurses-5.2-r5 ) + unicode? ( >=sys-libs/ncurses-5.2-r5[unicode] )" 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_prepare() { + epatch "${FILESDIR}"/${PN}-shared.patch } -src_compile() { +src_configure() { + local ncursesw use unicode && ncursesw="w" - econf $(use_enable nls) \ - "--with-ncurses${ncursesw}" || die "configure failed" - emake || die "build failed" + econf \ + $(use_enable nls) \ + $(use_with !minimal libtool) \ + --with-ncurses${ncursesw} } src_install() { - emake install DESTDIR="${D}" || die + 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 diff --git a/dev-util/dialog/files/dialog-shared.patch b/dev-util/dialog/files/dialog-shared.patch new file mode 100644 index 000000000000..9e58ba48a49d --- /dev/null +++ b/dev-util/dialog/files/dialog-shared.patch @@ -0,0 +1,80 @@ +--- 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 \ diff --git a/dev-util/dialog/metadata.xml b/dev-util/dialog/metadata.xml index c66b7883ddfe..3788b7c3c202 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> |