Unify live/release ebuilds, and properly control zlib dep.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 3bebca959764ad2239f127f4fe8523dedee03e12..24543df7ac7b20444fbd728894e3d3ea7e17028b 100644 (file)
--- 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/Manifest b/sys-devel/gdb/Manifest
index 3820e89c6ec965845540189b4c47766f18be9c46..80c0fa51e4ddfc9fc427f2288cf8dcc071b87312 100644 (file)
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -27,16 +27,26 @@ EBUILD gdb-7.0.1.ebuild 2662 RMD160 b0b28b127070a76420944c4b33bed46f73bf79b3 SHA
 EBUILD gdb-7.1.ebuild 2621 RMD160 11f84a78dbe93023ad5ee5cb726284f84bba8d3b SHA1 288f227938c607bc551e190a80a2e460e2be6e21 SHA256 46ba95a663ac81bfdb61b43f0b19ab05ae6f287fdd49a5174f492fe1cf5aca36
 EBUILD gdb-7.2.50.20101117.4.15.ebuild 3089 RMD160 b6ecd83162d74f5977678a1b48625949a2ef897b SHA1 0b73196b1914b7a4aaebc07f96c20ab293bd80bc SHA256 8f4c0108099ddc82cafd77896a1fa1b07a30f0bfec02909d61a84b9b93b070fc
 EBUILD gdb-7.2.ebuild 3498 RMD160 97d6ae6747660a07b8587d1c9bd92d99fb4261b4 SHA1 60236219e3e25cc8df44735fd45668d0b222e1d1 SHA256 72398724872bd5cd6c5a2b7d5881f8958bcc8958fdbcbb59e2772005cb964817
-EBUILD gdb-7.3.1-r1.ebuild 5276 RMD160 23185a1bc25d5c67f3a213f1174000382469b5bd SHA1 0d200d7191158060beebc0e224c87e6a29b36612 SHA256 d0fc67e25af15a028444fc67a8bee05d3601054c59a76ec649bc73c955b8aed7
+EBUILD gdb-7.3.1-r1.ebuild 5137 RMD160 371e54c475bc62420c510f2b66b9f8e38ac10812 SHA1 98a18fba1de23462afab4f379eec5ba8f6d29290 SHA256 dad0ce923b3bd5b97facbfabeb6c80dea2e055b216ea2a649e9a87cb6ca928e6
 EBUILD gdb-7.3.1.ebuild 3893 RMD160 19826cc6db479129f2c35ea812361905a607f47f SHA1 72b23ee81f4c653bad9b1e2640a91774bd6fe483 SHA256 415526fc6a3bac187e9cc00b022d5dfd61ba07d5c56aa758519047f080cc1b32
 EBUILD gdb-7.3.ebuild 3801 RMD160 59f24f3a7276a440fc4162863d52706febadea9b SHA1 a0a4aa9d51c7e5396d53e40536117b6c86277c30 SHA256 69aa29131061561ec60165e2f65e74a897ae2a5f51799ddce2c048a7a6606855
-EBUILD gdb-9999.ebuild 5058 RMD160 cc6ea92417a331461b8f3b4f21e553bc834fc2a0 SHA1 702c2e0652d0507e50e6072aa8466849f41690a8 SHA256 f919c5dbfc58067864e3a50fed27beba76f0ed06732d0eb1e46398f7bbfaf8ce
-MISC ChangeLog 27214 RMD160 9b739ddd6927f8378fcc950e0db3d1d4c58afa1f SHA1 736c9944c93c940d759249ec8e8959877209dce1 SHA256 eac84bd4b43641b1c616964d1421ee9cb64311520af4ed264f204237d744e373
+EBUILD gdb-9999.ebuild 5132 RMD160 41f8a0f48004f6e099107710db6d2b616f031e84 SHA1 4579c3566eb4d767124af94a943e3547d21907e9 SHA256 71491cf4626ed1873af822fa2ad9f9c412e16c079b8f8fef1390ea69740ad8fa
+MISC ChangeLog 27365 RMD160 bb7f86330482c77f8a80f850673b7e32cb65a84b SHA1 e6804f771511f6dd4113b34d54aba186ff6528fa SHA256 0c15f050f61462023d42ffce7f62c6f46107fbbcda7db133bb2e879758ec6dc9
 MISC metadata.xml 552 RMD160 05c46fb5af7dc382b5977a47dac90f077ddf7b68 SHA1 2aab7d540d4b18a618bf34d962c63ae9f7e18aed SHA256 e86791dadf315a7a079e460854bcc4a28d7c69a93694efc85014b325824b81cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (SunOS)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8MIiYACgkQX3X2B8XHTokeIwCeO8FtGuQenEgGbbuvQd7zYyG5
-bpUAoKB/XVPdGZOeE5Qz0vPpq5bptf99
-=e2w3
+iQIcBAEBAgAGBQJPEIJ9AAoJELEHsLL7fEFWp4EP/A4MMjwSw1NCmm6ne7wc9Oj6
+4ZAgl5teiN489S1ghnb//pXsZRBxZcNEXIeUeh2Grqkvh3SA2utoxMmbELmM2a7b
+Ny/PZ/wHSzuuN0TMlizqih5dtnIm6H+cPnLJx/Rzk21bF8BivD88vfXnuEqSRfKF
+tHQnajqX8oaRmcVca/rOy0eF8QRKriycYA3Aijha+y7hvksG61i7/f2djAbznJDK
+pS/zebm6/q9OolN7fCjUnc9Mo3X2BfnxHBPsD2IMZGO/Ecmvkwg4VBJizHd/uoEH
+j9qN6lW8U+czwgwX55RQ5hYhi5A323/WWGgIqBmAqLEY+/EKjohmt1ulE/o64YwD
+W9GPg4hryWnrO7WqZHi1eiXEqPUwdyRfXDeoV4V2lQV3ks1+Ek+kdZuVCA2dByBs
+YsuKLVHebS/rSvb3AGvBZWUuTcHhed6Sl9/FsejdTqWqyHtBFvJF9mdzO1BsO4ya
+20jhUyBHxdGWr249czgdsxVDJfJEEW/N7ai4bJblbbsHE4eUf3SkoHhqlq/6czNs
+iP85chm+/INDgE1eaPieyQgfkyDOtTAC27cE626HrLLM4rBMZYzteyd4TRDKwsj9
+S/3ERx1aOD8KYgaEWsyxXMOwEtDcAALx6+RGhoRb+gj+DEklo9NNWa+T6nrj1Cxs
+7xlGGTGC63+6Tz2MqIqz
+=sID5
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/gdb/gdb-7.3.1-r1.ebuild b/sys-devel/gdb/gdb-7.3.1-r1.ebuild
index 7e98e87baa756cd0398f4bcf6b38834261fd6605..a6c95b18033792e76c1a50e71c46cd1f4400d4e7 100644 (file)
--- 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 d90545495518cd0bd4069b0997638c3a17e2b174..840dead190fe95ef9092b47b945074b3ebfff259 100644 (file)
--- 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