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 BDAD01388C0 for ; Wed, 24 Feb 2016 17:50:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D51BCE080B; Wed, 24 Feb 2016 17:49:58 +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 6926EE080B for ; Wed, 24 Feb 2016 17:49:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 223DB340D2C for ; Wed, 24 Feb 2016 17:49:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1AF48DC for ; Wed, 24 Feb 2016 17:49:51 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1456336183.3ad1a8a478ec2ab0f53ca9cac198dfb7898ffb01.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/, profiles/arch/alpha/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/arch/alpha/package.mask sys-devel/gdb/Manifest sys-devel/gdb/gdb-7.10.1.ebuild sys-devel/gdb/gdb-7.11.ebuild sys-devel/gdb/gdb-7.9.1.ebuild X-VCS-Directories: profiles/arch/alpha/ sys-devel/gdb/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 3ad1a8a478ec2ab0f53ca9cac198dfb7898ffb01 X-VCS-Branch: master Date: Wed, 24 Feb 2016 17:49:51 +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: a2bc7833-36db-49fe-87a2-30feddaca407 X-Archives-Hash: 306a5fb1d1fb7ff09c99919f158c067f commit: 3ad1a8a478ec2ab0f53ca9cac198dfb7898ffb01 Author: Mike Frysinger gentoo org> AuthorDate: Wed Feb 24 17:48:39 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Feb 24 17:49:43 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad1a8a4 sys-devel/gdb: restore 7.9.1 for alpha, and move masking to the ebuild We have per-ebuild KEYWORDS to track arch issues, so move it out of the arch mask to keep things clear. profiles/arch/alpha/package.mask | 6 ------ sys-devel/gdb/Manifest | 1 + sys-devel/gdb/gdb-7.10.1.ebuild | 3 ++- sys-devel/gdb/gdb-7.11.ebuild | 3 ++- .../gdb/{gdb-7.10.1.ebuild => gdb-7.9.1.ebuild} | 20 ++++---------------- 5 files changed, 9 insertions(+), 24 deletions(-) diff --git a/profiles/arch/alpha/package.mask b/profiles/arch/alpha/package.mask index 579547f..986cea8 100644 --- a/profiles/arch/alpha/package.mask +++ b/profiles/arch/alpha/package.mask @@ -2,12 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -# Tobias Klausmann (03 Oct 2015) -# Hangs/spins-on-cpu with any program on alpha. -# Upstream bug: https://sourceware.org/bugzilla/show_bug.cgi?id=19061 -# Gentoo bug: 562128 ->=sys-devel/gdb-7.10 - # Alexey Shvetsov (21 May 2012) # Need deps pecl-apc and pecl-uploadprogress bug #416897 >=www-apps/drupal-7.14 diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest index 4cbac3e..2cabbb1 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -1,2 +1,3 @@ DIST gdb-7.10.1.tar.xz 18531436 SHA256 25c72f3d41c7c8554d61cacbeacd5f40993276d2ccdec43279ac546e3993d6d5 SHA512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010 WHIRLPOOL 02936f59d3f3f8a57966c72402f1da128dd8e10e686097ffdb3a2741cc0c1831ef27f97daa047fa006ff2ae9f79ae0480f6f0dc2d3f5904190a1dade0590c837 DIST gdb-7.11.tar.xz 18934392 SHA256 7a434116cb630d77bb40776e8f5d3937bed11dea56bafebb4d2bc5dd389fe5c1 SHA512 eadd2a59a1e48b1484eb2bea85256d6b1912926bc8b690793d02babf2639608bd22a0f2de77d4f60092da3b1dafeaa6d75a7cff3e84bd4e22fc46364b68e5e9f WHIRLPOOL 9ae283b05b278ec2844aa3cf54193d9fd5735508e2eb60c0d741f719f1598b4e374dab6d4ee48d78323b0b8038715969d20435f1b8ce20775f2b3f072759c994 +DIST gdb-7.9.1.tar.xz 17867692 SHA256 cd9c543a411a05b2b647dd38936034b68c2b5d6f10e0d51dc168c166c973ba40 SHA512 eebdf88b24e52e792b8a4b89ea85790de72b462a7810b44975fdf4232c068f353b15506071f450102a9d4bcecdde8e93dc3748a10699b7f73f3e04fb2d9d8414 WHIRLPOOL fe7afb392f453fa5aab290da3b74118c4e3bbae6f4e276f2efd7f978e3987e031d92ecd90d35e0531901f1cf68b04a313df050b25bb3b632d1b6e62360acd591 diff --git a/sys-devel/gdb/gdb-7.10.1.ebuild b/sys-devel/gdb/gdb-7.10.1.ebuild index 3c72cec..068546b 100644 --- a/sys-devel/gdb/gdb-7.10.1.ebuild +++ b/sys-devel/gdb/gdb-7.10.1.ebuild @@ -57,7 +57,8 @@ 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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + # alpha #562128 + KEYWORDS="-alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="+client expat lzma multitarget nls +python +server test vanilla" REQUIRED_USE=" diff --git a/sys-devel/gdb/gdb-7.11.ebuild b/sys-devel/gdb/gdb-7.11.ebuild index 50b1699..0b17d45 100644 --- a/sys-devel/gdb/gdb-7.11.ebuild +++ b/sys-devel/gdb/gdb-7.11.ebuild @@ -57,7 +57,8 @@ 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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + # alpha #562128 + KEYWORDS="-alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="+client expat lzma multitarget nls +python +server test vanilla" REQUIRED_USE=" diff --git a/sys-devel/gdb/gdb-7.10.1.ebuild b/sys-devel/gdb/gdb-7.9.1.ebuild similarity index 92% copy from sys-devel/gdb/gdb-7.10.1.ebuild copy to sys-devel/gdb/gdb-7.9.1.ebuild index 3c72cec..965d89b 100644 --- a/sys-devel/gdb/gdb-7.10.1.ebuild +++ b/sys-devel/gdb/gdb-7.9.1.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit flag-o-matic eutils python-single-r1 @@ -59,7 +59,7 @@ SLOT="0" if [[ ${PV} != 9999* ]] ; then KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -IUSE="+client expat lzma multitarget nls +python +server test vanilla" +IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) || ( client server ) @@ -72,7 +72,7 @@ RDEPEND="server? ( !dev-util/gdbserver ) expat? ( dev-libs/expat ) lzma? ( app-arch/xz-utils ) python? ( ${PYTHON_DEPS} ) - sys-libs/zlib + zlib? ( sys-libs/zlib ) )" DEPEND="${RDEPEND} app-arch/xz-utils @@ -102,7 +102,6 @@ gdb_branding() { else printf "vanilla" fi - [[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}" } src_configure() { @@ -149,16 +148,13 @@ src_configure() { # For gdb itself, it'll use the system version. --disable-readline --with-system-readline - # This only disables building in the zlib subdir. - # For gdb itself, it'll use the system version. - --without-zlib - --with-system-zlib --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug $(use_with expat) $(use_with lzma) $(use_enable nls) $(use multitarget && echo --enable-targets=all) $(use_with python python "${EPYTHON}") + $(use_with zlib) ) fi @@ -175,14 +171,6 @@ src_install() { use client && find "${ED}"/usr -name libiberty.a -delete cd "${S}" - # Delete translations that conflict with binutils-libs. #528088 - # Note: Should figure out how to store these in an internal gdb dir. - if use nls ; then - find "${ED}" \ - -regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \ - -delete - fi - # Don't install docs when building a cross-gdb if [[ ${CTARGET} != ${CHOST} ]] ; then rm -r "${ED}"/usr/share/{doc,info,locale}