Add support for live git trees, and merge the different versions we have for fedora/weekly snapshots.

(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)

3 files changed, 176 insertions, 18 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 4094809ede51..87cd4cb7255f 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.186 2011/08/13 17:49:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.187 2011/08/13 18:02:18 vapier Exp $
+
+*gdb-9999 (13 Aug 2011)
+
+  13 Aug 2011; Mike Frysinger <vapier@gentoo.org> gdb-7.3.ebuild,
+  +gdb-9999.ebuild:
+  Add support for live git trees, and merge the different versions we have for
+  fedora/weekly snapshots.
 
   13 Aug 2011; Mike Frysinger <vapier@gentoo.org> gdb-7.2.ebuild,
   gdb-7.3.ebuild:
diff --git a/sys-devel/gdb/gdb-7.3.ebuild b/sys-devel/gdb/gdb-7.3.ebuild
index 929abe2ef29a..26c34fde3e5e 100644
--- a/sys-devel/gdb/gdb-7.3.ebuild
+++ b/sys-devel/gdb/gdb-7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.ebuild,v 1.2 2011/08/13 17:49:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.3.ebuild,v 1.3 2011/08/13 18:02:18 vapier Exp $
 
 EAPI="3"
 
@@ -14,33 +14,46 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 fi
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 
-if [[ ${PV} == *.*.*.*.*.* ]] ; then
-	inherit versionator rpm
+RPM=
+MY_PV=${PV}
+case ${PV} in
+*.*.*.*.*.*)
 	# fedora version: gdb-6.8.50.20090302-8.fc11.src.rpm
+	inherit versionator rpm
 	gvcr() { get_version_component_range "$@"; }
 	MY_PV=$(gvcr 1-4)
 	RPM="${PN}-${MY_PV}-$(gvcr 5).fc$(gvcr 6).src.rpm"
-else
-	MY_PV=${PV}
-	RPM=
-fi
+	SRC_URI="mirror://fedora/development/source/SRPMS/${RPM}"
+	;;
+*.*.50.*)
+	# weekly snapshots
+	SRC_URI="ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
+	;;
+9999*)
+	# live git tree
+	inherit git-2
+	EGIT_REPO_URI="git://sourceware.org/git/gdb.git"
+	SRC_URI=""
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
+	;;
+esac
 
 PATCH_VER="1"
 DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sources.redhat.com/gdb/"
-if [[ -n ${RPM} ]] ; then
-	SRC_URI="http://mirrors.kernel.org/fedora/development/source/SRPMS/${RPM}"
-else
-	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
-		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
-fi
+HOMEPAGE="http://sourceware.org/gdb/"
 SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
 
 LICENSE="GPL-2 LGPL-2"
 is_cross \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+fi
 IUSE="expat multitarget nls python test vanilla"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2
@@ -92,7 +105,7 @@ src_test() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		libdir=/nukeme/pretty/pretty/please includedir=/nukeme/pretty/pretty/please \
+		{include,lib}dir=/nukeme/pretty/pretty/please \
 		install || die
 	rm -r "${D}"/nukeme || die
 
@@ -109,7 +122,9 @@ src_install() {
 	docinto sim
 	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
 
-	dodoc "${WORKDIR}"/extra/gdbinit.sample
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
 
 	# Remove shared info pages
 	rm -f "${D}"/usr/share/info/{annotate,bfd,configure,standards}.info*
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
new file mode 100644
index 000000000000..3f04ae7f3c7f
--- /dev/null
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2011 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.1 2011/08/13 18:02:18 vapier Exp $
+
+EAPI="3"
+
+inherit flag-o-matic eutils
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
+		export CTARGET=${CATEGORY/cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+RPM=
+MY_PV=${PV}
+case ${PV} in
+*.*.*.*.*.*)
+	# fedora version: gdb-6.8.50.20090302-8.fc11.src.rpm
+	inherit versionator rpm
+	gvcr() { get_version_component_range "$@"; }
+	MY_PV=$(gvcr 1-4)
+	RPM="${PN}-${MY_PV}-$(gvcr 5).fc$(gvcr 6).src.rpm"
+	SRC_URI="mirror://fedora/development/source/SRPMS/${RPM}"
+	;;
+*.*.50.*)
+	# weekly snapshots
+	SRC_URI="ftp://sources.redhat.com/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
+	;;
+9999*)
+	# live git tree
+	inherit git-2
+	EGIT_REPO_URI="git://sourceware.org/git/gdb.git"
+	SRC_URI=""
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
+		ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2"
+	;;
+esac
+
+PATCH_VER=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="http://sourceware.org/gdb/"
+SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
+
+LICENSE="GPL-2 LGPL-2"
+is_cross \
+	&& SLOT="${CTARGET}" \
+	|| SLOT="0"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+fi
+IUSE="expat multitarget nls python test vanilla"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r2
+	sys-libs/readline
+	expat? ( dev-libs/expat )
+	python? ( =dev-lang/python-2* )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/yacc
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	[[ -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
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+	if [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+}
+
+src_configure() {
+	strip-unsupported-flags
+	econf \
+		--with-pkgversion="$(gdb_branding)" \
+		--with-bugurl='http://bugs.gentoo.org/' \
+		--disable-werror \
+		--enable-64-bit-bfd \
+		--with-system-readline \
+		$(is_cross && echo --with-sysroot=/usr/${CTARGET}) \
+		$(use_with expat) \
+		$(use_enable nls) \
+		$(use multitarget && echo --enable-targets=all) \
+		$(use_with python python "${EPREFIX}/usr/bin/python2")
+}
+
+src_test() {
+	emake check || ewarn "tests failed"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		{include,lib}dir=/nukeme/pretty/pretty/please \
+		install || die
+	rm -r "${D}"/nukeme || die
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -r "${D}"/usr/share
+		return 0
+	fi
+
+	dodoc README
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+	docinto sim
+	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${D}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+}
+
+pkg_postinst() {
+	# portage sucks and doesnt unmerge files in /etc
+	rm -vf "${ROOT}"/etc/skel/.gdbinit
+}