vapier 14/03/09 00:04:37 Modified: gdb-9999.ebuild gdb-7.7.ebuild ChangeLog Log: Convert python support to use python-single-r1 and allow python 2.7 and 3.3 versions #503852 by Nikoli. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.24 sys-devel/gdb/gdb-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild?r1=1.23&r2=1.24 Index: gdb-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gdb-9999.ebuild 8 Mar 2014 23:59:24 -0000 1.23 +++ gdb-9999.ebuild 9 Mar 2014 00:04:37 -0000 1.24 @@ -1,10 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.23 2014/03/08 23:59:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.24 2014/03/09 00:04:37 vapier Exp $ EAPI="4" +PYTHON_COMPAT=( python{2_7,3_3} ) -inherit flag-o-matic eutils +inherit flag-o-matic eutils python-single-r1 export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then @@ -59,7 +60,7 @@ sys-libs/readline expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) - python? ( =dev-lang/python-2* ) + python? ( ${PYTHON_DEPS} ) zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} app-arch/xz-utils @@ -73,17 +74,6 @@ [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch strip-linguas -u bfd/po opcodes/po - if [[ ${CHOST} == *-darwin* ]] ; then - # make sure we have a python-config that matches our install, - # such that the python check doesn't fail just because the - # gdb-provided copy isn't quite what our python installed - # version is - rm -f "${S}"/gdb/python/python-config.py || die - pushd "${S}"/gdb/python > /dev/null || die - ln -s "${EROOT}"/usr/bin/$(eselect python show --python2)-config \ - python-config.py || die - popd > /dev/null || die - fi } gdb_branding() { @@ -141,7 +131,7 @@ $(use_with lzma) $(use_enable nls) $(use multitarget && echo --enable-targets=all) - $(use_with python python "${EPREFIX}/usr/bin/python2") + $(use_with python python "${EPYTHON}") $(use_with zlib) ) fi 1.4 sys-devel/gdb/gdb-7.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-7.7.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-7.7.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/gdb-7.7.ebuild?r1=1.3&r2=1.4 Index: gdb-7.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-7.7.ebuild 8 Mar 2014 23:59:24 -0000 1.3 +++ gdb-7.7.ebuild 9 Mar 2014 00:04:37 -0000 1.4 @@ -1,10 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7.ebuild,v 1.3 2014/03/08 23:59:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7.ebuild,v 1.4 2014/03/09 00:04:37 vapier Exp $ EAPI="4" +PYTHON_COMPAT=( python{2_7,3_3} ) -inherit flag-o-matic eutils +inherit flag-o-matic eutils python-single-r1 export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then @@ -59,7 +60,7 @@ sys-libs/readline expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) - python? ( =dev-lang/python-2* ) + python? ( ${PYTHON_DEPS} ) zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} app-arch/xz-utils @@ -73,17 +74,6 @@ [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch strip-linguas -u bfd/po opcodes/po - if [[ ${CHOST} == *-darwin* ]] ; then - # make sure we have a python-config that matches our install, - # such that the python check doesn't fail just because the - # gdb-provided copy isn't quite what our python installed - # version is - rm -f "${S}"/gdb/python/python-config.py || die - pushd "${S}"/gdb/python > /dev/null || die - ln -s "${EROOT}"/usr/bin/$(eselect python show --python2)-config \ - python-config.py || die - popd > /dev/null || die - fi } gdb_branding() { @@ -141,7 +131,7 @@ $(use_with lzma) $(use_enable nls) $(use multitarget && echo --enable-targets=all) - $(use_with python python "${EPREFIX}/usr/bin/python2") + $(use_with python python "${EPYTHON}") $(use_with zlib) ) fi 1.262 sys-devel/gdb/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/ChangeLog?rev=1.262&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/ChangeLog?rev=1.262&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gdb/ChangeLog?r1=1.261&r2=1.262 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- ChangeLog 8 Mar 2014 23:59:24 -0000 1.261 +++ ChangeLog 9 Mar 2014 00:04:37 -0000 1.262 @@ -1,6 +1,11 @@ # ChangeLog for sys-devel/gdb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.261 2014/03/08 23:59:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.262 2014/03/09 00:04:37 vapier Exp $ + + 09 Mar 2014; Mike Frysinger <[email protected]> gdb-7.7.ebuild, + gdb-9999.ebuild: + Convert python support to use python-single-r1 and allow python 2.7 and 3.3 + versions #503852 by Nikoli. 08 Mar 2014; Mike Frysinger <[email protected]> gdb-7.6.1.ebuild, gdb-7.6.2.ebuild, gdb-7.6.ebuild, gdb-7.7.ebuild, gdb-9999.ebuild:
