From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 283B813989A for ; Thu, 27 Aug 2015 17:04:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADC2B141D5; Thu, 27 Aug 2015 17:03:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34021141D5 for ; Thu, 27 Aug 2015 17:03:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09B05340B1F for ; Thu, 27 Aug 2015 17:03:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 80A49167 for ; Thu, 27 Aug 2015 17:03:56 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1440694990.0f20b4ddc60c23a84ae918f31933d8e5f0b7d9eb.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/ncurses/ncurses-6.0-r1.ebuild sys-libs/ncurses/ncurses-6.0.ebuild X-VCS-Directories: sys-libs/ncurses/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 0f20b4ddc60c23a84ae918f31933d8e5f0b7d9eb X-VCS-Branch: master Date: Thu, 27 Aug 2015 17:03:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 108e07cb-d918-4a48-9b89-f1f1379f0e19 X-Archives-Hash: 53a697d60fa9e0ecbef9bc8010903b2c commit: 0f20b4ddc60c23a84ae918f31933d8e5f0b7d9eb Author: Jason Zaman gentoo org> AuthorDate: Thu Aug 27 17:03:10 2015 +0000 Commit: Jason Zaman gentoo org> CommitDate: Thu Aug 27 17:03:10 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f20b4dd sys-libs/ncurses: Add bridging ebuild to fix slot move for 5/6 -> 0/6 Gentoo-Bug: https://bugs.gentoo.org/558856 Package-Manager: portage-2.2.20.1 .../{ncurses-6.0.ebuild => ncurses-6.0-r1.ebuild} | 0 sys-libs/ncurses/ncurses-6.0.ebuild | 270 +-------------------- 2 files changed, 9 insertions(+), 261 deletions(-) diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild similarity index 100% copy from sys-libs/ncurses/ncurses-6.0.ebuild copy to sys-libs/ncurses/ncurses-6.0-r1.ebuild diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0.ebuild index a8b1c1e..3a9d218 100644 --- a/sys-libs/ncurses/ncurses-6.0.ebuild +++ b/sys-libs/ncurses/ncurses-6.0.ebuild @@ -2,271 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# Bridge the old SLOT=5[/6] ebuild to the new SLOT=0/6 since the slotmove +# functionality does not handle implicit subslots correctly. #558856 + EAPI="5" -inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing +inherit multilib-build -MY_PV=${PV:0:3} -PV_SNAP=${PV:4} -MY_P=${PN}-${MY_PV} -DESCRIPTION="console display library" +DESCRIPTION="transitional package" HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" -SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" -LICENSE="MIT" -# The subslot reflects the SONAME. -SLOT="0/6" +LICENSE="metapackage" +SLOT="5/6" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode" - -DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )" -# berkdb? ( sys-libs/db )" -# Block the older ncurses that installed all files w/SLOT=5. #557472 -RDEPEND="${DEPEND} - !<=sys-libs/ncurses-5.9-r4:5 - !/dev/null) - local basedir=$(basename $(dirname "${termfile}")) - - if [[ -n ${termfile} ]] ; then - dodir /etc/terminfo/${basedir} - mv ${termfile} "${ED}"/etc/terminfo/${basedir}/ - dosym ../../../../etc/terminfo/${basedir}/${x} \ - /usr/share/terminfo/${basedir}/${x} - fi - done -# fi - - echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses - doenvd "${T}"/50ncurses - - use minimal && rm -r "${ED}"/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() { - preserve_old_lib /$(get_libdir)/libncurses.so.5 - use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5 -} +IUSE="ada +cxx gpm static-libs tinfo unicode" -pkg_postinst() { - preserve_old_lib_notify /$(get_libdir)/libncurses.so.5 - use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5 -} +RDEPEND="sys-libs/ncurses:0/6[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"