From a3a6bb1edb49567a17704ec7152db828e91e4c52 Mon Sep 17 00:00:00 2001 From: Harald van Dijk Date: Wed, 7 Jul 2010 22:22:36 +0000 Subject: [PATCH] Version bump (#325747 by gionnico) Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-util/dialog/ChangeLog | 11 ++- dev-util/dialog/Manifest | 16 ++-- dev-util/dialog/dialog-1.1.20070704.ebuild | 45 ----------- dev-util/dialog/dialog-1.1.20100428.ebuild | 52 ++++++++++++ .../files/dialog-1.1.20100428-shared.patch | 80 +++++++++++++++++++ dev-util/dialog/files/dialog-mkdirs.patch | 16 ---- 6 files changed, 149 insertions(+), 71 deletions(-) delete mode 100644 dev-util/dialog/dialog-1.1.20070704.ebuild create mode 100644 dev-util/dialog/dialog-1.1.20100428.ebuild create mode 100644 dev-util/dialog/files/dialog-1.1.20100428-shared.patch delete mode 100644 dev-util/dialog/files/dialog-mkdirs.patch 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 + -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/Manifest b/dev-util/dialog/Manifest index 399d9898492e..f4aa313adfc7 100644 --- a/dev-util/dialog/Manifest +++ b/dev-util/dialog/Manifest @@ -1,21 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX dialog-mkdirs.patch 551 RMD160 5c39e4d96210e5265fe3603b1915ab2c5633c613 SHA1 ffcbc8c50891dce7d466b0f2ae46100891a5e060 SHA256 570eb3f040afa05951e2d9f481528bf0e27e98e10c20afb70fe9ccf936bb00dc +AUX dialog-1.1.20100428-shared.patch 2676 RMD160 11a1e5a254163e81ae24f8244a67f9b71f5ddfa6 SHA1 47e4e0831d38bfc261ac038ecb1a64d4da348d3b SHA256 bcf2d0cf87b94b03a24ba1fabf36e631701efb3cd5257ee910bae69edf1ccf3e AUX dialog-shared.patch 2631 RMD160 628182f27964e3d6f14fa62528052f807a7d76ac SHA1 3dad7066faeff9bf040bc0c0b096097aaaab5a9d SHA256 79481e6a70495031f6db501c2d752e67fbbdbd09081b3b09dce0fdc2989d73d8 -DIST dialog-1.1-20070704.tgz 367588 RMD160 88487908ffd621a567d8ab6a601526b34411048e SHA1 af12f3d9872e1fd85cd7e9529335269648dd21c2 SHA256 b209880eace208758be5789ee213e60e999e5c6bf6aed739f6076c93cf8f6f2b DIST dialog-1.1-20080316.tgz 373022 RMD160 dbc2ec18fb181ca3be6fa92be0429fb2b1b2b2b1 SHA1 de136626fd4f3edf75b3997d75bb9bf151eb39f0 SHA256 bd11acbc57442930160dbbcea2d5024a27c71774c24412c44b9cdece9894e707 DIST dialog-1.1-20080819.tgz 378814 RMD160 c7e2ad63ccffb4a042a61e59dcc44e5c1e9a94b0 SHA1 068a46aa1ffbfe96fdbf5cedd480b795a4f6321a SHA256 c5d49b39c5998bcecd124c05cc6f096d22ccdc378ad455214611ae41a2f4b7d9 -EBUILD dialog-1.1.20070704.ebuild 1374 RMD160 e5dcf1bcf81ea7be80dd54863feadfa6b7a2acd5 SHA1 dd7ebac40bc8fa9d3d137f9809ef19793121eafb SHA256 178d1d52d265472ed12e5d72a485d9081c742547a10ea50bacb58aeecd703bcb +DIST dialog-1.1-20100428.tgz 400036 RMD160 fce98c3207ebdb155f01fb38df8b89de75f9b875 SHA1 6945b302bf5b107c12f6009c25699d265b45579c SHA256 3205574d988f600e8b5bf0a8833748fa26b76ec51bc9aa0a2a340067b51c7d01 EBUILD dialog-1.1.20080316.ebuild 1452 RMD160 437d0a77255ced236d8b07b8cc424565eceb4e6f SHA1 99cacddb065e6a0cea148e51f2fd1ee5b5f5bdf8 SHA256 d1d62f3f6fd49c796a67aad661d030baad6644df6fdc3eaf99bde0ef5ea116d9 EBUILD dialog-1.1.20080819-r1.ebuild 1307 RMD160 319a71e1979f0960f9d5307275cf41dfaff154da SHA1 982b0a0e262565168fb8d98d217c65a9a42e1704 SHA256 ef39b1482b46b2f444819c2e81b2d939f670be639eef0c48357a7e83a94ac36a EBUILD dialog-1.1.20080819.ebuild 1451 RMD160 7a85fa4d20e0e018025b122e13bf3a2bd0e8c4cb SHA1 c1ad835a82b47ed978e9df36b7f68bc839942934 SHA256 f4d95dabdd32875c6c32a05f06c9cae2ac3a9df33c6f38ee0d2d8e6b2aa6e039 -MISC ChangeLog 16734 RMD160 ba6662e21756c57eba9a1e7217cfcc9f78440ba5 SHA1 085a598eb19991eff079201ecb297ec88f7f1953 SHA256 fc66a2af3e5edbe4640a279542810590c1347f5b22942a7e505c723b6e1bbddc +EBUILD dialog-1.1.20100428.ebuild 1303 RMD160 00c1af2f0bba36b712995fced617990d7782891b SHA1 0829f2ec6e66ca5776576ae6f6a983b63c045b1c SHA256 69186b847a3b9abf84448824900865d63b728300378cad32b9356f57d8fe3106 +MISC ChangeLog 16991 RMD160 da2551017e939966ec8a71e12f1229672fde92fe SHA1 52742e6486fbd6bf899c8e190d5e91ccf7d2a5fa SHA256 2a12f4c992464893fb53a3b9530be3d467a1e210f5b7f31434211d3188e64c07 MISC metadata.xml 342 RMD160 5fc9ab35cabea23dc16c838374598452187226d7 SHA1 0398ccb7210e331231fe39738bd61987ca29ddd0 SHA256 964a101183691deb766af500f09d4c0d3281896c316839bd54fb2a094fc6396c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAknk+EoACgkQwnQyISwouHzSQgCdGY8LPNMHeSrEzbYHpckUP9Fo -c9wAoLu765f6xkEXGHVvVjmmAb5ZHTJ8 -=rKYc +iEYEARECAAYFAkw0/nUACgkQwnQyISwouHypDACfZa/F0V0QfUwm78cn3GNuXy2a +3ToAn33aP9gnnRAUMX04p/YIQZmsf02y +=4i0K -----END PGP SIGNATURE----- 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 - -- 2.26.2