From: Mike Frysinger Date: Thu, 22 Mar 2007 06:26:59 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca6147c76e60679bd61104fe440a719a934d8847;p=gentoo.git Version bump. Package-Manager: portage-2.1.2.2 --- diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog index 786f5ca4c1b8..73aeb527752e 100644 --- a/sys-libs/readline/ChangeLog +++ b/sys-libs/readline/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/readline # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.88 2007/01/13 19:36:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.89 2007/03/22 06:26:59 vapier Exp $ + +*readline-5.2_p2 (22 Mar 2007) + + 22 Mar 2007; Mike Frysinger +readline-5.2_p2.ebuild: + Version bump. 13 Jan 2007; Mike Frysinger readline-4.3-r5.ebuild, readline-5.0-r2.ebuild, readline-5.1_p4.ebuild, readline-5.2.ebuild, diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest index c9c6f8f3298d..1c6746bfa671 100644 --- a/sys-libs/readline/Manifest +++ b/sys-libs/readline/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025 MD5 d687545889dacb43e121f4932d99a534 files/bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 files/bash-3.0-etc-inputrc.patch 1443 @@ -69,6 +72,7 @@ DIST readline51-002 1149 RMD160 3eb4a80089d23f05d76f702952f0dbb7ef3ba24d SHA1 fb DIST readline51-003 707 RMD160 73d81615e92c8f6f6a4155af571361863014c5df SHA1 fba03ba37b6d9bbc6a612ec602ab1ff6d3038fc2 SHA256 939ea5fb84ff519ae50b9c2749f441a59af9f97ed0bf8fc0981af612ea720160 DIST readline51-004 2400 RMD160 a1089571a8104ae5ba9d2c36eb600c09654a3d05 SHA1 7295f43a42d112f2de935150d7c0cb2fd3fceece SHA256 ddb050c0161c9ccdabb84c75287fc8cc76791d096ebfb3e4bdc72f531d8551d1 DIST readline52-001 874 RMD160 0cedb82ccc4709e6b39e6cb95143131259b0e7c5 SHA1 8de77c2de3926893cbf2688912768bed48a2456b SHA256 eac304c369154059f93049ada328739faaf40338d3cb1fb4b544c93d5ce3f8d5 +DIST readline52-002 1433 RMD160 c9bbff4b1ba2ff77e5a43ad98a94f4753e5f0aa3 SHA1 db5baf0129357ba9397dfcd24e9f6db0abdcbc7a SHA256 9deacaef25507a0c2ae0b661bf9342559b59a2954d66ea3c5f5bcd900fdfcf78 EBUILD readline-4.3-r5.ebuild 2407 RMD160 53b927f67615b21bd45b5e7c2d3733135e61f57c SHA1 2f4976717d0b98c1b5ccbe155fa3d73c9e906c08 SHA256 6169be62dbe8b3f6700173ed5322e7f9bb088d153dcfbd8a83e42d052512419b MD5 2bbd6bd627571922b0572ffa8912b6c0 readline-4.3-r5.ebuild 2407 RMD160 53b927f67615b21bd45b5e7c2d3733135e61f57c readline-4.3-r5.ebuild 2407 @@ -89,10 +93,14 @@ EBUILD readline-5.2_p1.ebuild 2761 RMD160 c1106068c061748d455ea1e831888fd74b99c0 MD5 75c31424e3fe4917cbfbb86fdb57a065 readline-5.2_p1.ebuild 2761 RMD160 c1106068c061748d455ea1e831888fd74b99c050 readline-5.2_p1.ebuild 2761 SHA256 f8aa60309dad3df2ed3805cd4cd90c2d18d37763fa2ba0281c75efd3e203acdb readline-5.2_p1.ebuild 2761 -MISC ChangeLog 11716 RMD160 f423cdb247f00f59a2b2f60b89d041cffc918927 SHA1 9b4f420b6a18dda7a0c944258efaceb65974d9e5 SHA256 5eb57e57e33cfdf92631de27d7878cf476f26c69ea28bd21fa9ffa8c261b08bc -MD5 d7c98847253a047672791cc05d9657d3 ChangeLog 11716 -RMD160 f423cdb247f00f59a2b2f60b89d041cffc918927 ChangeLog 11716 -SHA256 5eb57e57e33cfdf92631de27d7878cf476f26c69ea28bd21fa9ffa8c261b08bc ChangeLog 11716 +EBUILD readline-5.2_p2.ebuild 2760 RMD160 fd41845281f0c154d7b1fac96441cd38f3f8b225 SHA1 c58338e6ffe2eccf3bd8d0f78e88e1b1c6b387ec SHA256 1ceac7e17ee53e82dc9ab8689ca9052ddeb01ae422d62715c395bfe3e0121b9b +MD5 50d089980d7f505603573ff8ba9bfcbb readline-5.2_p2.ebuild 2760 +RMD160 fd41845281f0c154d7b1fac96441cd38f3f8b225 readline-5.2_p2.ebuild 2760 +SHA256 1ceac7e17ee53e82dc9ab8689ca9052ddeb01ae422d62715c395bfe3e0121b9b readline-5.2_p2.ebuild 2760 +MISC ChangeLog 11840 RMD160 b984b1e67acfc4042d290cd759df5771c63ed491 SHA1 b4868d1ceff7474f1c0db47b964eca917b556eda SHA256 970a679377e6cae3e556834744108a8786cba20c0ca0d04fe9cae45b1ef0011e +MD5 2e92f549236d447cc1547a67f7080d94 ChangeLog 11840 +RMD160 b984b1e67acfc4042d290cd759df5771c63ed491 ChangeLog 11840 +SHA256 970a679377e6cae3e556834744108a8786cba20c0ca0d04fe9cae45b1ef0011e ChangeLog 11840 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -112,3 +120,13 @@ SHA256 d0a1f4592f1031c163cf2edf7a36627eae40de1971b89a9fd998f3850752d075 files/di MD5 4486107870b7834bebcb7c4dbd05d265 files/digest-readline-5.2_p1 455 RMD160 ea5ec5ab739b6d3a4a962099b57749e57d0a2691 files/digest-readline-5.2_p1 455 SHA256 c205562f5dbadc44dfe9349f3c796faf84fc063b10acac2be007a2d17129fd0a files/digest-readline-5.2_p1 455 +MD5 8e6bbeb2bfaad8219efcf26916179b41 files/digest-readline-5.2_p2 672 +RMD160 241a25444a19607b7ce49468da6e390b80011d6e files/digest-readline-5.2_p2 672 +SHA256 defebbf9ee76b13efab92b8ccafd517ad04dd007594594c4eefdbc1abae15e7e files/digest-readline-5.2_p2 672 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGAiHJ8bi6rjpTunYRAsDLAJ9i3q5On4+LKsu6BM4CQl7/MKUy2ACfSTt7 +CSRKkfMmnIc3aa6Rk8XpXlE= +=DNNP +-----END PGP SIGNATURE----- diff --git a/sys-libs/readline/files/digest-readline-5.2_p2 b/sys-libs/readline/files/digest-readline-5.2_p2 new file mode 100644 index 000000000000..2f29e7c8b8d3 --- /dev/null +++ b/sys-libs/readline/files/digest-readline-5.2_p2 @@ -0,0 +1,9 @@ +MD5 e39331f32ad14009b9ff49cc10c5e751 readline-5.2.tar.gz 2037705 +RMD160 983cbb25192e0a376b80cb2428fe8ee254a041c7 readline-5.2.tar.gz 2037705 +SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45 readline-5.2.tar.gz 2037705 +MD5 9d4d41622aa9b230c57f68548ce87d8f readline52-001 874 +RMD160 0cedb82ccc4709e6b39e6cb95143131259b0e7c5 readline52-001 874 +SHA256 eac304c369154059f93049ada328739faaf40338d3cb1fb4b544c93d5ce3f8d5 readline52-001 874 +MD5 f03e512d14206e37f7d6a748b56b9476 readline52-002 1433 +RMD160 c9bbff4b1ba2ff77e5a43ad98a94f4753e5f0aa3 readline52-002 1433 +SHA256 9deacaef25507a0c2ae0b661bf9342559b59a2954d66ea3c5f5bcd900fdfcf78 readline52-002 1433 diff --git a/sys-libs/readline/readline-5.2_p2.ebuild b/sys-libs/readline/readline-5.2_p2.ebuild new file mode 100644 index 000000000000..b9e22fa90674 --- /dev/null +++ b/sys-libs/readline/readline-5.2_p2.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.2_p2.ebuild,v 1.1 2007/03/22 06:26:59 vapier Exp $ + +inherit eutils multilib toolchain-funcs flag-o-matic + +# Official patches +# See ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/ +PLEVEL=${PV##*_p} +MY_PV=${PV/_p*} +MY_P=${PN}-${MY_PV} + +DESCRIPTION="Another cute console display library" +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +SRC_URI="mirror://gnu/readline/${MY_P}.tar.gz + $(for ((i=1; i<=PLEVEL; i++)); do + printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \ + ${MY_PV} ${MY_PV/\.} ${i} + printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \ + ${MY_PV} ${MY_PV/\.} ${i} + done)" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="" + +# We must be certain that we have a bash that is linked +# to its internal readline, else we may get problems. +RDEPEND=">=sys-libs/ncurses-5.2-r2" +DEPEND="${RDEPEND} + >=app-shells/bash-2.05b-r2" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${MY_P}.tar.gz + + cd "${S}" + # Official patches + local i + for ((i=1; i<=PLEVEL; i++)); do + epatch "${DISTDIR}"/${PN}${MY_PV/\.}-$(printf '%03d' ${i}) + done + epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch + epatch "${FILESDIR}"/${PN}-5.2-rlfe-build.patch #151174 + epatch "${FILESDIR}"/${PN}-5.1-rlfe-uclibc.patch + epatch "${FILESDIR}"/${PN}-5.1-fbsd-pic.patch + + ln -s ../.. examples/rlfe/readline + + # force ncurses linking #71420 + sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed" +} + +src_compile() { + append-flags -D_GNU_SOURCE + + # the --libdir= is needed because if lib64 is a directory, it will default + # to using that... even if CONF_LIBDIR isnt set or we're using a version + # of portage without CONF_LIBDIR support. + econf --with-curses --libdir=/usr/$(get_libdir) || die + emake || die + + if ! tc-is-cross-compiler; then + cd examples/rlfe + econf || die + emake || die "make rlfe failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die + dodir /$(get_libdir) + + if ! use userland_Darwin ; then + mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir) + chmod a+rx "${D}"/$(get_libdir)/*.so* + + # Bug #4411 + gen_usr_ldscript libreadline.so + gen_usr_ldscript libhistory.so + fi + + if ! tc-is-cross-compiler; then + dobin examples/rlfe/rlfe || die + fi + + dodoc CHANGELOG CHANGES README USAGE NEWS + docinto ps + dodoc doc/*.ps + dohtml -r doc +} + +pkg_preinst() { + preserve_old_lib /$(get_libdir)/lib{history,readline}.so.4 #29865 +} + +pkg_postinst() { + preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.4 +}