From 16633df76b91e9f2a6583a3342ac702c8fef7348 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 13 Nov 2011 20:06:25 +0000 Subject: [PATCH] Drop old ebuilds (to lose USE=nocxx). Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- sys-libs/ncurses/ChangeLog | 6 +- sys-libs/ncurses/Manifest | 20 +-- sys-libs/ncurses/ncurses-5.6-r2.ebuild | 160 ----------------------- sys-libs/ncurses/ncurses-5.7-r3.ebuild | 173 ------------------------- sys-libs/ncurses/ncurses-5.7-r5.ebuild | 168 ------------------------ sys-libs/ncurses/ncurses-5.7-r6.ebuild | 168 ------------------------ 6 files changed, 11 insertions(+), 684 deletions(-) delete mode 100644 sys-libs/ncurses/ncurses-5.6-r2.ebuild delete mode 100644 sys-libs/ncurses/ncurses-5.7-r3.ebuild delete mode 100644 sys-libs/ncurses/ncurses-5.7-r5.ebuild delete mode 100644 sys-libs/ncurses/ncurses-5.7-r6.ebuild diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog index 582097ccbbc9..2cf44bb58596 100644 --- a/sys-libs/ncurses/ChangeLog +++ b/sys-libs/ncurses/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/ncurses # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.189 2011/05/22 18:19:56 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.190 2011/11/13 20:06:25 vapier Exp $ + + 13 Nov 2011; Mike Frysinger -ncurses-5.6-r2.ebuild, + -ncurses-5.7-r3.ebuild, -ncurses-5.7-r5.ebuild, -ncurses-5.7-r6.ebuild: + Drop old ebuilds (to lose USE=nocxx). 22 May 2011; Kacper Kowalik ncurses-5.7-r7.ebuild: ppc64 stable wrt #353437 diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 246397ccf514..213e6999b904 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX ncurses-5.6-build.patch 265 RMD160 9958f375f7b305f1b8d52b27d9da746be9175263 SHA1 16990ca2cef127711074d70f9d40d256458969e9 SHA256 51cc2319ad1f854500d76ec978897f6af92d31cebb7f454c1fd649568ad4a251 AUX ncurses-5.6-gfbsd.patch 817 RMD160 2d5a96174730a93320e391cb057880df4996854e SHA1 b6798815c44059a00a2bcd4f9f28bbf74dfc0e2d SHA256 d9e94c5068a22d32f52c5db6aadc3793af11bb0c08b006e375921726931e0065 @@ -11,24 +11,16 @@ AUX ncurses-5.7-rxvt-unicode.patch 3339 RMD160 ad5fac04693b1cb08e942ba4ee9e3d166 AUX ncurses-5.7-tic-cross-detection.patch 1656 RMD160 cd30a10d49ce0a88fd031b38739032addd49d340 SHA1 584ac536cb09b84801336af4938f67c96ccab57a SHA256 afadd1db1530054cb745193723435a3dffceb9de541abc92caace89c2ea429a5 AUX ncurses-5.8-gfbsd.patch 695 RMD160 41081a2ae135dd9a149c949f31cfbcb06bf12610 SHA1 f1a90d9911349f464b0ed93aaf104b73b215110f SHA256 68c405dcd1b2bbad1d4880d906ba9e02ad62691c63edfb363ad767ee01079e82 AUX ncurses-5.8-rxvt-unicode.patch 3724 RMD160 d6b46469ce0078ec08e1fa405f0a1d9399970c56 SHA1 1adeb974f84197499e59d86991d6ce4f17194155 SHA256 385b6b2afe7b95e3ad172ece63ea60ee2b8db5b5c83f55209fbd319be5edf380 -DIST ncurses-5.6-coverity.patch.gz 6196 RMD160 b11682ae9e043be8d6c50f040d8531f80fc26ce8 SHA1 fee27bdd55c1c316248643e168865b55235d79c7 SHA256 3deeef017c739116c17574e7fd235b1b05053f5c50c7bfeeee2e3f8e4332380e -DIST ncurses-5.6.tar.gz 2402592 RMD160 1a878819c43e6426500fd74ccedf0a032ef399d8 SHA1 4d54d8ad0b90fffa2780a0a45edb6fcb027ef18d SHA256 f9cac2b31683a37d65bc37119599752198a0691e462d0d1a252cf9815f5724d5 DIST ncurses-5.7.tar.gz 2445052 RMD160 a19ca026d32255f5a4d22eb006d65182041e0234 SHA1 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797 SHA256 0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4 DIST ncurses-5.9.tar.gz 2826473 RMD160 dd7dffe38fcc908230ce3e036b71ced2d270ac9e SHA1 3e042e5f2c7223bffdaac9646a533b8c758b65b5 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b -EBUILD ncurses-5.6-r2.ebuild 4746 RMD160 2d0c4b141d8bc51c7bbe0745817e2d5b4b51147b SHA1 ed1e10beb9f436b298b9f59e6b0b7fdfd3ae144c SHA256 57d0c3a8058ddbb1bbed9d3d65be56b7947aa1e3459fe847de3cce456fa7a61e -EBUILD ncurses-5.7-r3.ebuild 5367 RMD160 a21be510f13353c36ac20b04258c1e996a618102 SHA1 b67f404968a91da5b7e6b4ea01346ad13ebcf0da SHA256 73d761ad50ddf9bd1c904f59c0bdb85c5e6450aa662a3af75dc99f664326ba3c -EBUILD ncurses-5.7-r5.ebuild 5253 RMD160 d0c2e290ee769cb4417ec7ed21d029595269baec SHA1 50e5a0ed42ce2c52cd93060f8a991c890aa05c19 SHA256 b4984c30c857ffd7d1474e1ebc2b78a118af6414cf35909db5af3dbee77abc61 -EBUILD ncurses-5.7-r6.ebuild 5256 RMD160 93f15baa19ec645411ff2b4f3458faa80740dfaa SHA1 2d64f6a6ab858dd79f6bc07fe35f684778b3b9ae SHA256 5da441e504f3b0504028cb7948ad55d76dd2789b0045c14b694aa9a9255f6441 EBUILD ncurses-5.7-r7.ebuild 5126 RMD160 9292a311c2eee95af143369891be944d8f1c7995 SHA1 53bd7470945a2fdf3d760c4d8b6aad27bba5b4a4 SHA256 768d9c817523e94b07aa031e95466bee13bcbedf0bb96115a8a2eab67fc84c6e EBUILD ncurses-5.9.ebuild 4889 RMD160 a77a9a494441fb1b23aeb4730e25895e0e501fb0 SHA1 420fbfa6b4dd1b9c88ac2911e90f56038c0cf6f0 SHA256 89c2a21edc3e256b9dde5096145387a94f784d82f993774c45c8e7d570b6914e -MISC ChangeLog 27388 RMD160 93578c1d3b47437694fa66ca52e04ffec20206ae SHA1 f8f14b6ba7b667c511799993df48d2e29cb64f36 SHA256 7e6db2fdc89ff9405f228b28d84b80578a5e2a80eaa88b847e0002e00931d301 +MISC ChangeLog 27573 RMD160 7658138f810e00e13457811164515d0444c787b0 SHA1 300df67da7c04399bb5189e2e37bc4c41ef4e233 SHA256 7d2eecea882c7d5266f907e9e79c9f54de3bbfa1f27dfdb688a103b534fe0c79 MISC metadata.xml 320 RMD160 cd60b146f09101932293157c33ac98f273c92783 SHA1 47c720e1ec7ce4a1c4de36edeac9cfd10004bbae SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQECAAYFAk3ZU9QACgkQIiMqcbOVdxR/ogP/XcCVO/yE5c4bV2GOymJLWjbE -Jso0FATWQoKU8TOtqtMG/4b57CiyHAxYJmmG5EvxDuTRSt0JA0XBraIxIH7hf2XL -VRGFQ0vo4/nb7PJ8InRMUUsF4k/8nESyjGB0XfjvZrnvX3ziraMoASvh7OyTZDIe -3J4hOks9v+enlNuY30A= -=K4vz +iF4EAREIAAYFAk7AI0cACgkQaC/OocHi7JaU+gEAnnKlzF3xh/VY7OMimPJxyIGk +aejgVrJlitrGDbMTO2kA/i+9tuAqqzY1le1uSyJPjHFBnB8+M15aKBed48R2mm9A +=wDcR -----END PGP SIGNATURE----- diff --git a/sys-libs/ncurses/ncurses-5.6-r2.ebuild b/sys-libs/ncurses/ncurses-5.6-r2.ebuild deleted file mode 100644 index 6d7f66d35410..000000000000 --- a/sys-libs/ncurses/ncurses-5.6-r2.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6-r2.ebuild,v 1.14 2009/10/11 05:38:15 vapier Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -MY_PV=${PV:0:3} -PV_SNAP=${PV:4} -MY_P=${PN}-${MY_PV} -DESCRIPTION="console display library" -HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz - ftp://invisible-island.net/ncurses/${PV}/${P}-coverity.patch.gz" - -LICENSE="MIT" -SLOT="5" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="debug doc gpm minimal nocxx profile trace unicode" - -DEPEND="gpm? ( sys-libs/gpm )" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh - epatch "${WORKDIR}"/${P}-coverity.patch - epatch "${FILESDIR}"/${PN}-5.6-gfbsd.patch - epatch "${FILESDIR}"/${PN}-5.6-build.patch #184700 -} - -src_compile() { - export ac_cv_prog_AWK=gawk #259510 - tc-export BUILD_CC - - # Protect the user from themselves #115036 - unset TERMINFO - - local myconf="" - use nocxx && myconf="${myconf} --without-cxx --without-cxx-binding" - - # First we build the regular ncurses ... - mkdir "${WORKDIR}"/narrowc - cd "${WORKDIR}"/narrowc - do_compile ${myconf} - - # Then we build the UTF-8 version - if use unicode ; then - mkdir "${WORKDIR}"/widec - cd "${WORKDIR}"/widec - do_compile ${myconf} --enable-widec --includedir=/usr/include/ncursesw - fi -} -do_compile() { - ECONF_SOURCE=${S} - - # We need the basic terminfo files in /etc, bug #37026. We will - # add '--with-terminfo-dirs' and then populate /etc/terminfo in - # src_install() ... - # The chtype/mmask-t settings below are to retain ABI compat - # with ncurses-5.4 so dont change em ! - local conf_abi=" - --with-chtype=long \ - --with-mmask-t=long \ - --disable-ext-colors \ - --disable-ext-mouse \ - " - econf \ - --libdir="/$(get_libdir)" \ - --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \ - --with-shared \ - $(use_with debug) \ - $(use_with profile) \ - $(use_with gpm) \ - --disable-termcap \ - --enable-symlinks \ - --with-rcs-ids \ - --with-manpage-format=normal \ - --enable-const \ - --enable-colorfgbg \ - --enable-echo \ - --without-ada \ - --enable-warnings \ - $(use_with debug assertions) \ - $(use_with !debug leaks) \ - $(use_with debug expanded) \ - $(use_with !debug macros) \ - $(use_with trace) \ - ${conf_abi} \ - "$@" \ - || die "configure failed" - - # A little hack to fix parallel builds ... they break when - # generating sources so if we generate the sources first (in - # non-parallel), we can then build the rest of the package - # in parallel. This is not really a perf hit since the source - # generation is quite small. -vapier - emake -j1 sources || die "make sources failed" - emake || die "make failed" -} - -src_install() { - # install unicode version second so that the binaries in /usr/bin - # support both wide and narrow - cd "${WORKDIR}"/narrowc - emake DESTDIR="${D}" install || die "make narrowc install failed" - if use unicode ; then - cd "${WORKDIR}"/widec - emake DESTDIR="${D}" install || die "make widec install failed" - fi - - # Move static and extraneous ncurses libraries out of /lib - dodir /usr/$(get_libdir) - cd "${D}"/$(get_libdir) - mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/ - gen_usr_ldscript lib{,n}curses.so - if use unicode ; then - mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/ - gen_usr_ldscript lib{,n}cursesw.so - fi - - # We need the basic terminfo files in /etc, bug #37026 - einfo "Installing basic terminfo files in /etc..." - for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} \ - xterm xterm-color xterm-xfree86 - do - local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) - local basedir=$(basename $(dirname "${termfile}")) - - if [[ -n ${termfile} ]] ; then - dodir /etc/terminfo/${basedir} - mv ${termfile} "${D}"/etc/terminfo/${basedir}/ - dosym ../../../../etc/terminfo/${basedir}/${x} \ - /usr/share/terminfo/${basedir}/${x} - fi - done - - # Build fails to create this ... - dosym ../share/terminfo /usr/$(get_libdir)/terminfo - - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses - doenvd "${T}"/50ncurses - - use minimal && rm -r "${D}"/usr/share/terminfo - # Because ncurses5-config --terminfo returns the directory we keep it - keepdir /usr/share/terminfo #245374 - - cd "${S}" - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc - use doc && dohtml -r doc/html/ -} - -pkg_preinst() { - use unicode || preserve_old_lib /$(get_libdir)/libncursesw.so.5 -} - -pkg_postinst() { - use unicode || preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 -} diff --git a/sys-libs/ncurses/ncurses-5.7-r3.ebuild b/sys-libs/ncurses/ncurses-5.7-r3.ebuild deleted file mode 100644 index f60e989947a0..000000000000 --- a/sys-libs/ncurses/ncurses-5.7-r3.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r3.ebuild,v 1.10 2010/03/06 23:12:41 vapier Exp $ - -EAPI="1" -inherit eutils flag-o-matic toolchain-funcs - -MY_PV=${PV:0:3} -PV_SNAP=${PV:4} -MY_P=${PN}-${MY_PV} -DESCRIPTION="console display library" -HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="5" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="ada +cxx debug doc gpm minimal profile trace unicode" - -DEPEND="gpm? ( sys-libs/gpm )" -# berkdb? ( sys-libs/db )" -RDEPEND="!/dev/null) - local basedir=$(basename $(dirname "${termfile}")) - - if [[ -n ${termfile} ]] ; then - dodir /etc/terminfo/${basedir} - mv ${termfile} "${D}"/etc/terminfo/${basedir}/ - dosym ../../../../etc/terminfo/${basedir}/${x} \ - /usr/share/terminfo/${basedir}/${x} - fi - done - - # Build fails to create this ... - dosym ../share/terminfo /usr/$(get_libdir)/terminfo -# fi - - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses - doenvd "${T}"/50ncurses - - use minimal && rm -r "${D}"/usr/share/terminfo* - # Because ncurses5-config --terminfo returns the directory we keep it - keepdir /usr/share/terminfo #245374 - - cd "${S}" - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc - use doc && dohtml -r doc/html/ -} diff --git a/sys-libs/ncurses/ncurses-5.7-r5.ebuild b/sys-libs/ncurses/ncurses-5.7-r5.ebuild deleted file mode 100644 index 01805d8ce3cc..000000000000 --- a/sys-libs/ncurses/ncurses-5.7-r5.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r5.ebuild,v 1.1 2010/07/07 19:25:28 vapier Exp $ - -EAPI="1" -inherit eutils flag-o-matic toolchain-funcs - -MY_PV=${PV:0:3} -PV_SNAP=${PV:4} -MY_P=${PN}-${MY_PV} -DESCRIPTION="console display library" -HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="5" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="ada +cxx debug doc gpm minimal profile static-libs trace unicode" - -DEPEND="gpm? ( sys-libs/gpm )" -# berkdb? ( sys-libs/db )" -RDEPEND="!/dev/null) - local basedir=$(basename $(dirname "${termfile}")) - - if [[ -n ${termfile} ]] ; then - dodir /etc/terminfo/${basedir} - mv ${termfile} "${D}"/etc/terminfo/${basedir}/ - dosym ../../../../etc/terminfo/${basedir}/${x} \ - /usr/share/terminfo/${basedir}/${x} - fi - done - - # Build fails to create this ... - dosym ../share/terminfo /usr/$(get_libdir)/terminfo -# fi - - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses - doenvd "${T}"/50ncurses - - use minimal && rm -r "${D}"/usr/share/terminfo* - # Because ncurses5-config --terminfo returns the directory we keep it - keepdir /usr/share/terminfo #245374 - - cd "${S}" - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc - use doc && dohtml -r doc/html/ -} diff --git a/sys-libs/ncurses/ncurses-5.7-r6.ebuild b/sys-libs/ncurses/ncurses-5.7-r6.ebuild deleted file mode 100644 index a824bcece0f4..000000000000 --- a/sys-libs/ncurses/ncurses-5.7-r6.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r6.ebuild,v 1.1 2010/11/15 11:55:07 wired Exp $ - -EAPI="1" -inherit eutils flag-o-matic toolchain-funcs - -MY_PV=${PV:0:3} -PV_SNAP=${PV:4} -MY_P=${PN}-${MY_PV} -DESCRIPTION="console display library" -HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="5" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="ada +cxx debug doc gpm minimal profile static-libs trace unicode" - -DEPEND="gpm? ( sys-libs/gpm )" -# berkdb? ( sys-libs/db )" -RDEPEND="!/dev/null) - local basedir=$(basename $(dirname "${termfile}")) - - if [[ -n ${termfile} ]] ; then - dodir /etc/terminfo/${basedir} - mv ${termfile} "${D}"/etc/terminfo/${basedir}/ - dosym ../../../../etc/terminfo/${basedir}/${x} \ - /usr/share/terminfo/${basedir}/${x} - fi - done - - # Build fails to create this ... - dosym ../share/terminfo /usr/$(get_libdir)/terminfo -# fi - - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses - doenvd "${T}"/50ncurses - - use minimal && rm -r "${D}"/usr/share/terminfo* - # Because ncurses5-config --terminfo returns the directory we keep it - keepdir /usr/share/terminfo #245374 - - cd "${S}" - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc - use doc && dohtml -r doc/html/ -} -- 2.26.2