sys-devel/gdb: force zlib w/newer versions

Upstream has moved to using zlib all the time, so update the deps and
configure flags to match.  Otherwise we'd end up using the local zlib.

diff --git a/sys-devel/gdb/gdb-7.10-r1.ebuild b/sys-devel/gdb/gdb-7.10-r1.ebuild
index 9e9dde1288a0ba1eeb3f3f6615839c53871d2a4f..8d9e6c989a8cb04e59825c7019f8f65ae25ed2a0 100644 (file)
--- a/sys-devel/gdb/gdb-7.10-r1.ebuild
+++ b/sys-devel/gdb/gdb-7.10-r1.ebuild
@@ -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 zlib"
+IUSE="+client expat lzma multitarget nls +python +server test vanilla"
 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} )
-               zlib? ( sys-libs/zlib )
+               sys-libs/zlib
        )"
 DEPEND="${RDEPEND}
        app-arch/xz-utils
@@ -149,13 +149,16 @@ 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
 

diff --git a/sys-devel/gdb/gdb-7.10.1.ebuild b/sys-devel/gdb/gdb-7.10.1.ebuild
index 99e8b65bc77c8b9204fb1ad4a6688f4992073365..e83f85ceba956b997e9cb7587fa35b0a089339f9 100644 (file)
--- a/sys-devel/gdb/gdb-7.10.1.ebuild
+++ b/sys-devel/gdb/gdb-7.10.1.ebuild
@@ -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 zlib"
+IUSE="+client expat lzma multitarget nls +python +server test vanilla"
 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} )
-               zlib? ( sys-libs/zlib )
+               sys-libs/zlib
        )"
 DEPEND="${RDEPEND}
        app-arch/xz-utils
@@ -149,13 +149,16 @@ 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
 

diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 9e9dde1288a0ba1eeb3f3f6615839c53871d2a4f..8d9e6c989a8cb04e59825c7019f8f65ae25ed2a0 100644 (file)
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -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 zlib"
+IUSE="+client expat lzma multitarget nls +python +server test vanilla"
 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} )
-               zlib? ( sys-libs/zlib )
+               sys-libs/zlib
        )"
 DEPEND="${RDEPEND}
        app-arch/xz-utils
@@ -149,13 +149,16 @@ 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