diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-01-13 19:13:57 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2012-01-13 19:13:57 +0000 |
commit | b489473dc5e0e52a0bf62dd86e254115890ba475 (patch) | |
tree | f08abbcd6c9ba951f5a82d253b374e911243306f | |
parent | Fix autoreconf with >=automake-1.11.2 wrt bug #397715 by Jason Mours <jason.m... (diff) | |
download | gentoo-2-b489473dc5e0e52a0bf62dd86e254115890ba475.tar.gz gentoo-2-b489473dc5e0e52a0bf62dd86e254115890ba475.tar.bz2 gentoo-2-b489473dc5e0e52a0bf62dd86e254115890ba475.zip |
Unify live/release ebuilds, and properly control zlib dep.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
-rw-r--r-- | sys-devel/gdb/ChangeLog | 6 | ||||
-rw-r--r-- | sys-devel/gdb/gdb-7.3.1-r1.ebuild | 20 | ||||
-rw-r--r-- | sys-devel/gdb/gdb-9999.ebuild | 12 |
3 files changed, 18 insertions, 20 deletions
diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog index 3bebca959764..24543df7ac7b 100644 --- a/sys-devel/gdb/ChangeLog +++ b/sys-devel/gdb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/gdb # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.204 2012/01/10 11:33:50 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.205 2012/01/13 19:13:57 vapier Exp $ + + 13 Jan 2012; Mike Frysinger <vapier@gentoo.org> gdb-7.3.1-r1.ebuild, + gdb-9999.ebuild: + Unify live/release ebuilds, and properly control zlib dep. 10 Jan 2012; Fabian Groffen <grobian@gentoo.org> gdb-7.3.1-r1.ebuild: Fix installation with USE=client on 64-bits Solaris targets diff --git a/sys-devel/gdb/gdb-7.3.1-r1.ebuild b/sys-devel/gdb/gdb-7.3.1-r1.ebuild index 7e98e87baa75..a6c95b180337 100644 --- a/sys-devel/gdb/gdb-7.3.1-r1.ebuild +++ b/sys-devel/gdb/gdb-7.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.5 2012/01/10 11:33:50 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.1-r1.ebuild,v 1.6 2012/01/13 19:13:57 vapier Exp $ EAPI="3" @@ -52,13 +52,14 @@ SLOT="0" if [[ ${PV} != 9999* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -IUSE="+client expat multitarget nls +python +server test vanilla" +IUSE="+client expat multitarget nls +python +server test vanilla zlib" RDEPEND="!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) - python? ( =dev-lang/python-2* )" + python? ( =dev-lang/python-2* ) + zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} app-arch/xz-utils virtual/yacc @@ -119,6 +120,7 @@ src_configure() { $(use_enable nls) $(use multitarget && echo --enable-targets=all) $(use_with python python "${EPREFIX}/usr/bin/python2") + $(use_with zlib) ) fi @@ -132,17 +134,7 @@ src_test() { src_install() { use server && ! use client && cd gdb/gdbserver emake DESTDIR="${D}" install || die - if use client; then - case ${CHOST} in - x86_64-*-solaris*|sparcv9-*-solaris*) - # usr/lib/64 -> usr/lib/{sparcv9,amd64} (no usr/lib64!) - rm "${ED}"/usr/lib/*/libiberty.a || die - ;; - *) - rm "${ED}"/usr/lib*/libiberty.a || die - ;; - esac - fi + use client && { find "${ED}"/usr -name libiberty.a -delete || die ; } cd "${S}" # Don't install docs when building a cross-gdb diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild index d90545495518..840dead190fe 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.7 2012/01/02 05:42:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.8 2012/01/13 19:13:57 vapier Exp $ EAPI="3" @@ -50,15 +50,16 @@ SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.x LICENSE="GPL-2 LGPL-2" SLOT="0" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -IUSE="+client expat multitarget nls +python +server test vanilla" +IUSE="+client expat multitarget nls +python +server test vanilla zlib" RDEPEND="!dev-util/gdbserver >=sys-libs/ncurses-5.2-r2 sys-libs/readline expat? ( dev-libs/expat ) - python? ( =dev-lang/python-2* )" + python? ( =dev-lang/python-2* ) + zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} app-arch/xz-utils virtual/yacc @@ -119,6 +120,7 @@ src_configure() { $(use_enable nls) $(use multitarget && echo --enable-targets=all) $(use_with python python "${EPREFIX}/usr/bin/python2") + $(use_with zlib) ) fi @@ -132,7 +134,7 @@ src_test() { src_install() { use server && ! use client && cd gdb/gdbserver emake DESTDIR="${D}" install || die - use client && { rm "${ED}"/usr/lib*/libiberty.a || die ; } + use client && { find "${ED}"/usr -name libiberty.a -delete || die ; } cd "${S}" # Don't install docs when building a cross-gdb |