From 2c18107cc880fd720773e7a480c3d922afd08b2b Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 29 Dec 2014 07:42:09 +0000 Subject: [PATCH] Fixed installation location for documents (bug #533770 by Chris Mayo). Removed old versions Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC --- sys-libs/readline/ChangeLog | 7 +- sys-libs/readline/Manifest | 32 ++-- sys-libs/readline/readline-6.2_p1.ebuild | 104 ------------- sys-libs/readline/readline-6.3_p8-r1.ebuild | 3 +- sys-libs/readline/readline-6.3_p8.ebuild | 161 -------------------- 5 files changed, 23 insertions(+), 284 deletions(-) delete mode 100644 sys-libs/readline/readline-6.2_p1.ebuild delete mode 100644 sys-libs/readline/readline-6.3_p8.ebuild diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog index 2ed7a849fac5..3718186660b8 100644 --- a/sys-libs/readline/ChangeLog +++ b/sys-libs/readline/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/readline # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.218 2014/10/27 01:53:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.219 2014/12/29 07:42:08 polynomial-c Exp $ + + 29 Dec 2014; Lars Wendler -readline-6.2_p1.ebuild, + -readline-6.3_p8.ebuild, readline-6.3_p8-r1.ebuild: + Fixed installation location for documents (bug #533770 by Chris Mayo). + Removed old versions. 27 Oct 2014; Mike Frysinger readline-6.2_p5-r1.ebuild: Mark m68k/s390/sh stable. diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest index 6cd857f5b68d..c414953e6007 100644 --- a/sys-libs/readline/Manifest +++ b/sys-libs/readline/Manifest @@ -43,26 +43,24 @@ DIST readline63-007 1428 SHA256 4d79b5a2adec3c2e8114cbd3d63c1771f7c6cf6403536862 DIST readline63-008 1452 SHA256 3bc093cf526ceac23eb80256b0ec87fa1735540d659742107b6284d635c43787 SHA512 8e30bbca3aa5cea8c2ee511abe0ec8f131608d74fe5ab24d68bcf452267f0f97446ed6e7cd482360876ce6c027280e4f4450cae05eb18f56046240f4c224841c WHIRLPOOL 94d9371e6ca35e72565c1990e0ec8bedf8a141f0a3d061e4928f6184c3ef4a4b472f4278d443b990a53977ad6f3f7bdbf41e51a999202b48414df3a946bb9796 EBUILD readline-4.3_p5.ebuild 1591 SHA256 a0f153f8c647359666a214d47647514853a17c2dde8a5a52e0ff934cebb55b4a SHA512 0fe334f4cf3e1a4b0d00bcea4bbdac0664db730462e7dfc8fc231a70795e05fa97285ae301b0b0aa01154cd9f6def741bc2e21a7b82831daa51b3f2ff552a439 WHIRLPOOL 87337d29334668dba75f965228acbd3d850059f0b0a3a34282d4c263b418ee2f99dc0eac1ccef59a09c71b4ba2ee13e5924cfdf48d3a514d7a0732b82bad261c EBUILD readline-5.2_p14.ebuild 1905 SHA256 170279df1909b218b3c9ff6b9cc3e315b1a72b8f1a6b5615010e903d67c65259 SHA512 1ad3ccb540e9a50c5bcc6e37689b6534371d4038db57cefb826eb112cf8a28ac1b647cead266dbf5b13a14b0da541a4a3e42343ac67461eefae5670adfec947f WHIRLPOOL 9a72cccb826deffed24f144ec1aeceb3b2c5194a0f072bffba1de42eba0708931d9eb75482847316803796ddc6afa5bd0ca1ce71edd4aef0fc0d2cecc9be1a30 -EBUILD readline-6.2_p1.ebuild 2805 SHA256 b28b3345767cee1fa6f78e2f1298ba6c823c71ffa6dc3e21cc0b21bd561b54ad SHA512 811078d180819d329a84a69b00d6c5e99871b5e15ece17aca2797672a319c8dfbdfd55048ed4d2a1993562d51945dff08bc3d5635abb5f38c2f142c41037aae6 WHIRLPOOL 4b13d886ce70682ecd4fcc46fc3a1a8750e7b6d29c945383e1cb6a3eeed2e0d71d04810adfbf58f39aa1033c5ac642035e7c3c271860022f8712914f4dfba800 EBUILD readline-6.2_p5-r1.ebuild 4138 SHA256 5dd233e4e9e1d66aabdba6631551eaa174af1af70c5d0110ac8c9784150085ec SHA512 c281c67b15a590a9c9aa0c3a84bdb151ff7fdf3efe33f4a30d4e63ea6cbb29b48c820fbd0b2a233aa8b2349379b464c119b5c793854e36c4b012b53ba986a87d WHIRLPOOL 588bac8a9c53fce242166a6c89644aa42396b2d5922cdcf0de03decdd13d1ce9f1ec4b97259a642edf5f2d520366ef72f088ff5abdc9fa410e02c8054b96836d -EBUILD readline-6.3_p8-r1.ebuild 4528 SHA256 596758faf0acac437eed832b17ebac6fd7f70a99c4125d1151f926c08b448f27 SHA512 0b0f0e7d95d5c830b230b394b1992d588ba2a3c349875f27095b446ec71200f08a9b88474b00ac53960387c1d0ad432d80392194d8bafabe1e1a443f742bedfa WHIRLPOOL e81a9f3ce0735e342234891216b65347bf4f43edf257da7fafe56d395b5e17dca812dc117677a4ce3baa28862d8d3df8c3a936d6700314f722f24309dad60fc7 -EBUILD readline-6.3_p8.ebuild 4461 SHA256 59c8d73549c773d7b657bbce7ceec9ff78b13b6d66b3deeed7df8427da0b90c5 SHA512 7f8c0e3601505b18b1da5298f9ff50e4530ba90d935b725cd2a7262ddf23c12999fdc5438b4ea51f91084a23df8cf7bfac8e265e65e337a35aa671ca16dfe75c WHIRLPOOL a411dd003ba12d43742298e1d7d4492389a7020ad44760e75e2d47284566ba656c37a7a1c7c16627efeed2b32f9651ded9dffba90666b2a96be4d98e71d4543c -MISC ChangeLog 29293 SHA256 cbd4a30a2184f40d5fca658ce1842e95b133a770137d87c68109aa7406e5d3fe SHA512 ca69cba1bca3ee908d4a8637d887645c3f56a83ff688f7ff60e6de97abffe551e1b855ba62d8a87f3ab86760ba81c7b01dee359da38a620eb2ec71acf0f7d042 WHIRLPOOL a89a14cd54a04582147cf3913b9c20f3eb7e44c74c72b187ae1a0562dc608b217b7c5497e339e0e79ef8625646b89d4e0ebd266b0adcbee02d88eae48694765e +EBUILD readline-6.3_p8-r1.ebuild 4562 SHA256 d77fcecf028f4bbf80e976675051d2401e91af11848d37ebf3630dccebeec397 SHA512 a4c021c3339ac6b34212dcfd19d5abd4028c28aba2e9d0c15c9313832e14aefe1f63545a1e86405fa7ff7f89be08a02e7cdc325b1d4d116a85fc17187d7ef5ad WHIRLPOOL 5f7abb327b5cee3af7db5683dac9956e6c0e633602ec0483ac50e68418b185af7f19b78e6118956111a17891f857819910dfd593f9aecb4c5fdaf370eca756df +MISC ChangeLog 29530 SHA256 934e1aca1b358253405e04ea357af52e97b1fdcc284179be08f44a585f0d289f SHA512 45d496ac65642d7939578295c4cb6abc3284dee9475bd3e187018c6bfa5d2f24f3476995ddebe65b21a186816d5db0aee6cc15fee4860a8c0b550790408ca39f WHIRLPOOL 34c40c3df42ba3787964681ccf2934d0172329c2e01905f889057de3695bcc61e8f5a80def73b59c0a9d75d351f287054c8d251498c9ffacf7f72f7693e3f939 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUTaWDAAoJEPGu1DbS6WIAG3IP+wVVSqPQmvG7Ly9L4hPhuUa+ -zoHNHqX11nJhj5rAtztR7wHfGFbFGMn3gSAMaymocs0WVNjR2BSvk1n+fKqtpbhA -A/ce10O96NuwFV6CquB1CiVfqMzKFbZTX8NLKSX8g53D2B0MM6tBf8e1kO4SOSi3 -f515QaZsTxK3vsVjNufxOflz8XUGaGPnMJNFNjYh/Ty+UIAtFyBrYYdYwln960Ft -8OkEAiwEYgXkgZvuGJNeAebKM3dtfHQjDWtAatGhIzqeQGjQI8D+rLE+tlPhVyUa -PUvdhi1gNy/1UfoAp3LaRhsuGox1MSE3CtuTR3vGO9zWPkfof/zvNVcCAiBd90y9 -Ofj/+SnZp4GsVb1GAZ6yqOelMLhPlti7JcotE11bXz3Y/YEO5SolGdshBLBX/TQL -qc7vUJesuXIICajEF+9IY0Sa1w7Zg6sRW9rUFUuOK7ylvnR6sRybjP5QiaivB/8a -gBnKarGS6R9A5cbuF5ciOlvrdoWM5thpbi8XwJLhMNg/ZbPfTKLEdtumpBbM5udC -t5G33gFDUA79E4Q05GmOAWZR4fNMfODltyheoticK9qsyVfSIHCMWI/LuvtamLjd -BBfW3wjwyTzX2auNSTnW425hEyOQo9SSG9j2R778/rnbcPTtwgg0BAoWJ5BiTznT -lJ9U2FL+HrAgA1coYSPM -=4fr8 +iQIcBAEBCAAGBQJUoQXRAAoJEPiazRVxLXTFMFYQALcXfaZlAs5P95m4bAGuSAW7 +O/5kfZHnzmYvAzyGm62pqivR88bWZ/qdHTQgpDN2H9hLuzWRCreidxwQThec/cKw +eNEhnGq4XJR8QbHObIlci3jogeqf7h0HbMFq0mzQZ0GcxJifFfRcHe2z2tpPNkQV +AOVef0DQep4Ft8rev78e+b+8ukGD4x7yQkDwZS/chnK5ucPOrVgQgxuGdPa2nMI3 +j3clgJSj4nCwFjkPdgXGCvMnToR2bpls+H2ZaS+lFbQdbRyIbbS4rxEu1g4lO18Q +SmRJo9q34eulzai+fAXxjQxIE3COpOhPZEJN+/1jdXYqBLAm4xd/3YIMD4peiROE +IDKTgKTnHVCYPe1H7t6omz/rJ1gQOIs12xu/L1Pr1Mm6oZ8DCoJ++VOiwLEVpgfe +vvyABCk6NaSAZRMwljhedzfEtzpcxHSAJbXFVR0UGSJSerM6tCyi0tEfouzrFkgR +AAXoefLhXgRZURE9bkP04JZ+5xth+CDSgMJOUWkoW78rQ8n964a58wmqpXRphwtc +LeBM7vkjEuayWIzCXU4p+npcBQtyjDnox+aqedYxmi6aHYMIXZjIYKnZc/DR0LMw +g8mHrG4c56FCqmG95LTqw0baioYPSos1oM7gb7eNn1nIeNKUbT7xwr4mIjRhzGLL +J+Njkapj5XZAjK0/yMM5 +=RNEF -----END PGP SIGNATURE----- diff --git a/sys-libs/readline/readline-6.2_p1.ebuild b/sys-libs/readline/readline-6.2_p1.ebuild deleted file mode 100644 index 6543bdfaffe3..000000000000 --- a/sys-libs/readline/readline-6.2_p1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p1.ebuild,v 1.11 2014/01/18 02:22:43 vapier Exp $ - -inherit eutils multilib toolchain-funcs flag-o-matic - -# Official patches -# See ftp://ftp.cwru.edu/pub/bash/readline-6.0-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} -[[ ${PV} != *_p* ]] && PLEVEL=0 -patches() { - [[ ${PLEVEL} -eq 0 ]] && return 1 - local opt=$1 - eval set -- {1..${PLEVEL}} - set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") - if [[ ${opt} == -s ]] ; then - echo "${@/#/${DISTDIR}/}" - else - local u - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do - printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" - done - fi -} - -DESCRIPTION="Another cute console display library" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND=">=sys-libs/ncurses-5.2-r2" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${MY_P}.tar.gz - - cd "${S}" - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch - epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952 - - # force ncurses linking #71420 - sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed" - - # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated - # objformat for years, so we don't want to rely on that. - sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die - - ln -s ../.. examples/rlfe/readline # for local readline headers -} - -src_compile() { - # fix implicit decls with widechar funcs - append-cppflags -D_GNU_SOURCE - # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html - append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free - - econf --with-curses || die - emake || die - - if ! tc-is-cross-compiler ; then - # code is full of AC_TRY_RUN() - cd examples/rlfe - append-ldflags -L. - local l - for l in readline history ; do - ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) - ln -sf ../../lib${l}.a lib${l}.a - done - econf || die - emake || die - fi -} - -src_install() { - emake DESTDIR="${D}" install || die - gen_usr_ldscript -a readline history #4411 - - 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,5} #29865 -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5} -} diff --git a/sys-libs/readline/readline-6.3_p8-r1.ebuild b/sys-libs/readline/readline-6.3_p8-r1.ebuild index 77ac1479fdc5..96a22361076c 100644 --- a/sys-libs/readline/readline-6.3_p8-r1.ebuild +++ b/sys-libs/readline/readline-6.3_p8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8-r1.ebuild,v 1.1 2014/08/30 08:20:50 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8-r1.ebuild,v 1.2 2014/12/29 07:42:08 polynomial-c Exp $ EAPI=4 @@ -106,6 +106,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ --cache-file="${BUILD_DIR}"/config.cache \ + --docdir=/usr/share/doc/${PF} \ --with-curses \ $(use_enable static-libs static) diff --git a/sys-libs/readline/readline-6.3_p8.ebuild b/sys-libs/readline/readline-6.3_p8.ebuild deleted file mode 100644 index 60cec2024a00..000000000000 --- a/sys-libs/readline/readline-6.3_p8.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.3_p8.ebuild,v 1.1 2014/08/12 11:15:41 polynomial-c Exp $ - -EAPI=4 - -inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal - -# Official patches -# See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} -[[ ${PV} != *_p* ]] && PLEVEL=0 -patches() { - [[ ${PLEVEL} -eq 0 ]] && return 1 - local opt=$1 - eval set -- {1..${PLEVEL}} - set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@") - if [[ ${opt} == -s ]] ; then - echo "${@/#/${DISTDIR}/}" - else - local u - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do - printf "${u}/${PN}-${MY_PV}-patches/%s " "$@" - done - fi -} - -DESCRIPTION="Another cute console display library" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" -IUSE="static-libs" - -RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${MY_P}.tar.gz -} - -src_prepare() { - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch - epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091 - - # Force ncurses linking. #71420 - # Use pkg-config to get the right values. #457558 - local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs) - sed -i \ - -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \ - support/shobj-conf || die - sed -i \ - -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \ - examples/rlfe/configure || die - - # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated - # objformat for years, so we don't want to rely on that. - sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die - - ln -s ../.. examples/rlfe/readline # for local readline headers -} - -src_configure() { - # fix implicit decls with widechar funcs - append-cppflags -D_GNU_SOURCE - # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html - append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free - - # Make sure configure picks a better ar than `ar`. #484866 - export ac_cv_prog_AR=$(tc-getAR) - - # Force the test since we used sed above to force it. - export bash_cv_termcap_lib=ncurses - - # Control cross-compiling cases when we know the right answer. - # In cases where the C library doesn't support wide characters, readline - # itself won't work correctly, so forcing the answer below should be OK. - if tc-is-cross-compiler ; then - export bash_cv_func_sigsetjmp='present' - export bash_cv_func_ctype_nonascii='yes' - export bash_cv_wcwidth_broken='no' #503312 - fi - - # This is for rlfe, but we need to make sure LDFLAGS doesn't change - # so we can re-use the config cache file between the two. - append-ldflags -L. - - multilib-minimal_src_configure -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - --cache-file="${BUILD_DIR}"/config.cache \ - --with-curses \ - $(use_enable static-libs static) - - if multilib_is_native_abi && ! tc-is-cross-compiler ; then - # code is full of AC_TRY_RUN() - mkdir -p examples/rlfe || die - cd examples/rlfe || die - ECONF_SOURCE=${S}/examples/rlfe \ - econf --cache-file="${BUILD_DIR}"/config.cache - fi -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi && ! tc-is-cross-compiler ; then - # code is full of AC_TRY_RUN() - cd examples/rlfe || die - local l - for l in readline history ; do - ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) - ln -sf ../../lib${l}.a lib${l}.a - done - emake - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi ; then - gen_usr_ldscript -a readline history #4411 - - if ! tc-is-cross-compiler; then - dobin examples/rlfe/rlfe - fi - fi -} - -multilib_src_install_all() { - einstalldocs - dodoc USAGE - dohtml -r doc/. - docinto ps - dodoc doc/*.ps -} - -pkg_preinst() { - preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865 -} - -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5} -} -- 2.26.2