From: Mike Frysinger Date: Sun, 31 Oct 2004 05:28:00 +0000 (+0000) Subject: old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5faa6c2e9caffdbdfa588324e9958c1a58470b93;p=gentoo.git old --- diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest index d869bf4b1402..5999b4372be6 100644 --- a/sys-libs/readline/Manifest +++ b/sys-libs/readline/Manifest @@ -1,17 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 1f8cdb8cd648a420456a67b62b64cc14 ChangeLog 6058 -MD5 f72f4f19fcbf7bf962ae885d077142e0 readline-4.1-r5.ebuild 1762 -MD5 d3c4a60f05d3fdebd20bd21155c74fc8 readline-5.0.ebuild 2162 -MD5 d7b1dc17f7ee54a56fa4a57acae5bc24 readline-5.0-r1.ebuild 2269 -MD5 c45be70cfbe979355e83578914ee1d41 readline-4.3-r4.ebuild 2380 -MD5 db6534a4552341f9b4483577e8e103bb readline-4.3-r5.ebuild 2642 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 1a87099fee28788ccc9dc11d30ef8362 readline-4.3-r5.ebuild 2639 MD5 0bc2f5a9e2a444057779d18e8034e25b readline-4.3-r6.ebuild 3176 -MD5 f9e8af7cdcf7ac973c77fc6a712af5de files/digest-readline-4.1-r5 64 +MD5 d7b1dc17f7ee54a56fa4a57acae5bc24 readline-5.0-r1.ebuild 2269 +MD5 d3c4a60f05d3fdebd20bd21155c74fc8 readline-5.0.ebuild 2162 MD5 630ead02f80504e86e85dc4957bd27cb files/digest-readline-5.0 65 -MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223 -MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r1 350 -MD5 e9b856acd523c385a29d67cd3475885e files/digest-readline-4.3-r4 177 -MD5 d0d23a9f000344da88a00a248d0af60c files/readline4.3-mbutil.patch 1678 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348 MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504 +MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223 +MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r1 350 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.9.10 (GNU/Linux) + +iD8DBQFBhHf9HTu7gpaalycRAgp/AKDq4b+zNEpWPm1fJTfJJ76/gOcdKgCeIV/k +6jj2etkF8rrLhkqvkvHjclo= +=i9P5 +-----END PGP SIGNATURE----- diff --git a/sys-libs/readline/files/digest-readline-4.1-r5 b/sys-libs/readline/files/digest-readline-4.1-r5 deleted file mode 100644 index 9872f692ea49..000000000000 --- a/sys-libs/readline/files/digest-readline-4.1-r5 +++ /dev/null @@ -1 +0,0 @@ -MD5 d0c31936fb627237275fdfd991fe3873 readline-4.1.tar.gz 744169 diff --git a/sys-libs/readline/files/digest-readline-4.3-r4 b/sys-libs/readline/files/digest-readline-4.3-r4 deleted file mode 100644 index 3ce983e2b2f1..000000000000 --- a/sys-libs/readline/files/digest-readline-4.3-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f86f7cb717ab321fe15f1bbcb058c11e readline-4.3.tar.gz 961662 -MD5 aacf1c41717f305ab5ce45e9d028821d readline43-001 1126 -MD5 8df4bf2c7e77e05c4ecd949b9b5dedf3 readline43-002 738 diff --git a/sys-libs/readline/files/readline4.3-mbutil.patch b/sys-libs/readline/files/readline4.3-mbutil.patch deleted file mode 100644 index 4b765ad25ec0..000000000000 --- a/sys-libs/readline/files/readline4.3-mbutil.patch +++ /dev/null @@ -1,68 +0,0 @@ -*** ../readline-4.3/mbutil.c Tue Jun 4 11:54:29 2002 ---- mbutil.c Mon Aug 5 11:20:39 2002 -*************** -*** 206,210 **** - { - /* shorted to compose multibyte char */ -! memset (ps, 0, sizeof(mbstate_t)); - return -2; - } ---- 206,211 ---- - { - /* shorted to compose multibyte char */ -! if (ps) -! memset (ps, 0, sizeof(mbstate_t)); - return -2; - } -*************** -*** 213,217 **** - /* invalid to compose multibyte char */ - /* initialize the conversion state */ -! memset (ps, 0, sizeof(mbstate_t)); - return -1; - } ---- 214,219 ---- - /* invalid to compose multibyte char */ - /* initialize the conversion state */ -! if (ps) -! memset (ps, 0, sizeof(mbstate_t)); - return -1; - } -*************** -*** 226,232 **** - int - _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2) -! char *buf1, *buf2; -! mbstate_t *ps1, *ps2; -! int pos1, pos2; - { - int i, w1, w2; ---- 228,237 ---- - int - _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2) -! char *buf1; -! int pos1; -! mbstate_t *ps1; -! char *buf2; -! int pos2; -! mbstate_t *ps2; - { - int i, w1, w2; -*************** -*** 277,282 **** - /* clear the state of the byte sequence, because - in this case effect of mbstate is undefined */ -! memset (ps, 0, sizeof (mbstate_t)); - } - else - pos += tmp; ---- 282,290 ---- - /* clear the state of the byte sequence, because - in this case effect of mbstate is undefined */ -! if (ps) -! memset (ps, 0, sizeof (mbstate_t)); - } -+ else if (tmp == 0) -+ pos++; - else - pos += tmp; diff --git a/sys-libs/readline/readline-4.1-r5.ebuild b/sys-libs/readline/readline-4.1-r5.ebuild deleted file mode 100644 index b85a0c119456..000000000000 --- a/sys-libs/readline/readline-4.1-r5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.1-r5.ebuild,v 1.10 2004/08/24 04:36:42 swegener Exp $ - -inherit eutils - -DESCRIPTION="Another cute console display library" -SRC_URI="mirror://gnu/readline/${P}.tar.gz" -LICENSE="GPL-2" -KEYWORDS="x86 ppc sparc " -IUSE="" -SLOT="0" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" - -DEPEND="virtual/libc - >=sys-libs/ncurses-5.2-r2" - -RDEPEND="virtual/libc" - -src_compile() { - - # Don't install redunant rluserman.info - sed -e 's|${INSTALL_DATA.*rluserman\.info.*|: &|' doc/Makefile.in \ - > doc/Makefile.in.new - mv doc/Makefile.in.new doc/Makefile.in - - ./configure --host=${CHOST} --with-curses \ - --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info - assert "configure failed" - make ${MAKEOPTS} || die "make failed" - cd shlib - make ${MAKEOPTS} || die "make in shlib failed" - -} - - -src_install() { - - make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install - assert "make install failed" - cd shlib - make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install - assert "make install in shlib failed" - - cd .. - - dodir /lib - mv ${D}/usr/lib/*.so* ${D}/lib - # bug #4411 - gen_usr_ldscript libreadline.so - gen_usr_ldscript libhistory.so - # end bug #4411 - dosym libhistory.so.${PV} /lib/libhistory.so - dosym libreadline.so.${PV} /lib/libreadline.so - # Needed because make install uses ${D} for the link - dosym libhistory.so.${PV} /lib/libhistory.so.4 - dosym libreadline.so.${PV} /lib/libreadline.so.4 - chmod 755 ${D}/lib/*.${PV} - - dodoc CHANGELOG CHANGES COPYING MANIFEST README USAGE - docinto ps - dodoc doc/*.ps - dohtml doc/*.html - -} diff --git a/sys-libs/readline/readline-4.3-r4.ebuild b/sys-libs/readline/readline-4.3-r4.ebuild deleted file mode 100644 index e1bbb7ee6207..000000000000 --- a/sys-libs/readline/readline-4.3-r4.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r4.ebuild,v 1.23 2004/09/08 15:17:46 vapier Exp $ - -inherit eutils gnuconfig - -# Official patches -PLEVEL="x001 x002" - -DESCRIPTION="Another cute console display library" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="mirror://gnu/readline/${P}.tar.gz - ${PLEVEL//x/mirror://gnu/${PN}/${PN}-${PV}-patches/${PN}${PV/\.}-}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64" -IUSE="" - -# We must be certain that we have a bash that is linked -# to its internal readline, else we may get problems. -DEPEND=">=app-shells/bash-2.05b-r2 - >=sys-libs/ncurses-5.2-r2" - -src_unpack() { - unpack ${P}.tar.gz - - cd ${S} - for x in ${PLEVEL//x} - do - epatch ${DISTDIR}/${PN}${PV/\.}-${x} - done - - # Fix segfaults in Python when using latin-1 chars in interactive mode - # (bug #11762). - epatch ${FILESDIR}/readline4.3-mbutil.patch - - gnuconfig_update -} - -src_compile() { - - econf --with-curses || die - - emake || die - cd shlib - emake || die -} - - -src_install() { - - make prefix=${D}/usr mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info install || die - cd ${S}/shlib - make prefix=${D}/usr mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info install || die - - cd ${S} - - dodir /lib - mv ${D}/usr/lib/*.so* ${D}/lib - rm -f ${D}/lib/*.old - # bug #4411 - gen_usr_ldscript libreadline.so - gen_usr_ldscript libhistory.so - # end bug #4411 - dosym libhistory.so.${PV/a/} /lib/libhistory.so - dosym libreadline.so.${PV/a/} /lib/libreadline.so - # Needed because make install uses ${D} for the link - dosym libhistory.so.${PV/a/} /lib/libhistory.so.4 - dosym libreadline.so.${PV/a/} /lib/libreadline.so.4 - chmod 755 ${D}/lib/*.${PV/a/} - - dodoc CHANGELOG CHANGES COPYING MANIFEST README USAGE - docinto ps - dodoc doc/*.ps - dohtml -r doc - - # Backwards compatibility #29865 - if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then - cp -a ${ROOT}/lib/libreadline.so.4.1 ${D}/lib/ - touch ${D}/lib/libreadline.so.4.1 - fi -} - -pkg_postinst() { - if [ -e ${ROOT}/lib/libreadline.so.4.1 ] ; then - ewarn "Your old readline libraries have been copied over." - ewarn "You should run 'revdep-rebuild --soname libreadline.so.4.1' asap." - ewarn "Once you have, you can safely delete /lib/libreadline.so.4.1" - fi -} diff --git a/sys-libs/readline/readline-4.3-r5.ebuild b/sys-libs/readline/readline-4.3-r5.ebuild index 8814bbbf5845..5abcf2b5d868 100644 --- a/sys-libs/readline/readline-4.3-r5.ebuild +++ b/sys-libs/readline/readline-4.3-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r5.ebuild,v 1.18 2004/09/30 19:38:11 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r5.ebuild,v 1.19 2004/10/31 05:28:00 vapier Exp $ inherit eutils gnuconfig @@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/readline/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 ppc sparc ~mips alpha arm hppa amd64 ia64 ppc64 s390" +KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390" IUSE="" # We must be certain that we have a bash that is linked