Merge rpm and non-rpm ebuilds, and version bump the rpm one.

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

4 files changed, 156 insertions, 12 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 4dec3da4d8b8..753ee9074270 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.174 2010/09/14 00:35:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.175 2010/12/31 21:06:28 vapier Exp $
+
+*gdb-7.2.50.20101117.4.15 (31 Dec 2010)
+
+  31 Dec 2010; Mike Frysinger <vapier@gentoo.org> gdb-7.2.ebuild,
+  +gdb-7.2.50.20101117.4.15.ebuild:
+  Merge rpm and non-rpm ebuilds, and version bump the rpm one.
 
   14 Sep 2010; Mike Frysinger <vapier@gentoo.org> gdb-7.2.ebuild:
   Fix EAPI=3 porting and force usage of python-2 by Arfrever Frehtes Taifersar
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 273d86cd8f9f..7766067eef89 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -7,28 +7,28 @@ DIST gdb-6.7.1-patches-1.3.tar.bz2 109192 RMD160 412c8ef3a4dd2073bd56b01d762af8c
 DIST gdb-6.7.1.tar.bz2 15080950 RMD160 c5ae709aefe75094c8d08341bfb882b490ddb2a2 SHA1 4ecfb5896d511111d9a5d91e937501caa9d33ced SHA256 f98cec38420f4f1ce3da2f16e6045f086d24dfcf05996b2d74f8620691442f62
 DIST gdb-6.8-patches-1.4.tar.lzma 122922 RMD160 fbe74b5dc6400389a4a7d70597b0028cbe480c93 SHA1 1c37bb223ff4b7eb7cbba249af1a216a3bf289e6 SHA256 83121b238df52e4556ea197112f6103b34965b8e1773ab1af2949baf53f8dde4
 DIST gdb-6.8-patches-1.5.tar.lzma 125348 RMD160 f0f2668b709aa4f06a77b8c9a9d147273a08d73c SHA1 ff0bb2d76ca8681554eca94272ff0cde4b7d75dd SHA256 e503204a517992595b37f49e6cb115bcb1c210845197d54d974ffd53bc55647b
-DIST gdb-6.8.50.20090811-2.fc12.src.rpm 18556041 RMD160 e3ae747d901e840e3de293acb78e72fd9bf5c936 SHA1 2868336a74938f20a3819b5b51e8eeb7f8a43d3d SHA256 023a1d7e57f590a684af4dd3dbee4eb0ac5a133e41f665249548ec3b89b622a8
 DIST gdb-6.8.tar.bz2 15581509 RMD160 23fc9442290b6383ce8f943ef1eb117fa06e79fb SHA1 ba1394d59dd84a1dd3a83322bd82c799596f0bcf SHA256 eedffd586bf41cf2ae2f77e6819545d6eb1e5062052320a27332fdfaaebdf818
 DIST gdb-7.0.1-patches-1.tar.lzma 11216 RMD160 0755535e1bc3c54750b077fdb9faab590caaa513 SHA1 ef711d464892a06818947dccd8f48ad037395fd8 SHA256 711d6fb705a0ede2ede6adb036def73f8c7c4fbc9b5a4f27d829800af4d84292
 DIST gdb-7.0.1.tar.bz2 17614682 RMD160 b042b7d3b3e59dda1184640c3e999f68b2114835 SHA1 a6b9693b5767dd3b1a3fa925563252afd20eea64 SHA256 560c3fd0053ade6549e71bd045f70282feb88db73b35e401bbad601a311e3c1b
 DIST gdb-7.1-patches-1.tar.lzma 9207 RMD160 61d829abcfe7186f679ead31540fc9c2c9f0aad9 SHA1 35ca21761d451481a1ff0caa12c95eb9eb0f4e67 SHA256 d2efe1ee66110e4e0c55bbe4365380bdb6e159c45ea849a1e329ac293b4e7e3c
 DIST gdb-7.1.tar.bz2 17977195 RMD160 800d224496240a360c996e588490f2d87367c4e3 SHA1 417e2e637a296ea0e1cdddf56233311b8708fa19 SHA256 142c27d7970a4e652dc225d61d887777ae00cf22fdd75cd1e8e4e13bfbd85352
 DIST gdb-7.2-patches-1.tar.xz 8908 RMD160 ca1ec5360ef2b575a548a75baeef90c4aec64138 SHA1 d91b1aa7d743cfbf98d1c72f6015dfa7b856fb86 SHA256 c091d46b869aec70ea507d93936d85e134002766808e38cc29d0a6f1f4898fab
+DIST gdb-7.2.50.20101117-4.fc15.src.rpm 20026108 RMD160 3a29004cb9806c235ad6cf9107eecf9cf26ebc55 SHA1 0a5c3bc903c77ab07f8813be5484cb0716864577 SHA256 7af3cc31317cc4fcc7530ac23d86baa570309095a7c4e8a7999a830ff6f07ca7
 DIST gdb-7.2.tar.bz2 18530613 RMD160 2f2f5eb331593a276f1b7024ac35f7ca1520653d SHA1 cae138dee0c11778c471a1d5e4b09e0ae08f9e9d SHA256 bf444b88ab845243364c3d410be9e3f43a57f96ff594d65a37842ea03c3410f0
 EBUILD gdb-6.6-r2.ebuild 1965 RMD160 dd9796c54dd064da5320890ae75b5daeb990966e SHA1 3fa16ab607a198a45df1c97a89ce014428e67cc0 SHA256 8616917d220910323743342822761795e29ee199e77fc7602ca9483e7e7d1e37
 EBUILD gdb-6.7.1-r3.ebuild 2057 RMD160 c0b55697d29010498fba876759fd5761ac30da33 SHA1 97aa63d6901f8ee641f0295d4e7ec3b0f718cf50 SHA256 e19744a4814fd530cde4420f1d24a81ae61c141b7f5f8866a8ae964e0a898b12
 EBUILD gdb-6.8-r1.ebuild 2217 RMD160 52a6b0aab722ab31ba81c0d69594018722e116ec SHA1 53ef7917808a0831c43b2c1227fa5738a1fa0ded SHA256 c06f279e6fb71eaba409a4a9c3d8ef559d3fc9615edc126110639c333013a3aa
 EBUILD gdb-6.8-r2.ebuild 2281 RMD160 d954946874299851eb7208dcfe46b59a6884fc90 SHA1 50b82fe8fa0898f1addbef936084da71e2de7bd3 SHA256 cecbcc830902a52f65998fdddb153a939596db5fdb5a7f4352db3384f6230878
-EBUILD gdb-6.8.50.20090811.2.12.ebuild 2827 RMD160 b51e23ec33ed66a10915575727bcebf277e8d955 SHA1 b116e312c3fadcf6d88d127da5d9a5f518334b46 SHA256 8d08edc0c431993d54bf6e9f9896cb8e07a177295f06be67ec5b6d07926cf98f
 EBUILD gdb-7.0.1.ebuild 2662 RMD160 b0b28b127070a76420944c4b33bed46f73bf79b3 SHA1 90bc46657854cc1611d011a61d571b3ebb4669a1 SHA256 018f756e5b16deb603844761e8630cff51fa4c367390681d346247074e346a38
 EBUILD gdb-7.1.ebuild 2670 RMD160 8a257a0dd3994f46850405b3f3ff1635575a1429 SHA1 2883816a8af5b8b2690157a539fb9401c2aa0778 SHA256 38bef842b2120058e1818d2c3403bb6faccfea6e22093c1d52460920fdf8d890
-EBUILD gdb-7.2.ebuild 2669 RMD160 5bd729ee8621f448db83fb96cc4b0a203f4b7f41 SHA1 6197ced1025597e6a42bf0c09e9626b93725832b SHA256 432047f525d1ca76f93ea11e2fd66817139d62275c39cb4b6232d3e97e401f24
-MISC ChangeLog 23296 RMD160 870cee32bba297d273dce505b842c95c9175f825 SHA1 973583a0d83c7b8a42a20745bfb684a31d50fb8b SHA256 1f38f74b1ce481812126a249dec2624f894d47bb01a017874bf75f35056a1250
+EBUILD gdb-7.2.50.20101117.4.15.ebuild 3089 RMD160 b6ecd83162d74f5977678a1b48625949a2ef897b SHA1 0b73196b1914b7a4aaebc07f96c20ab293bd80bc SHA256 8f4c0108099ddc82cafd77896a1fa1b07a30f0bfec02909d61a84b9b93b070fc
+EBUILD gdb-7.2.ebuild 3149 RMD160 bbac8a218e8bc6557b58e794657c5d55e14fdd27 SHA1 7f31c6b65e0a866d24669a6fbdb0f89dca878bc2 SHA256 f06f7941d9cb0831ba333f913e108f7c14eec1ff68015ee24314c284b6eeec79
+MISC ChangeLog 23503 RMD160 b1eeea2c5a37a85f1c7edd8fd76cb2d4b2225a9f SHA1 3f574957b10811590b523e09f5a282d363ffb83a SHA256 f5d686ba2e11f5be4f828c957fc1ae4876ddc5df19a919c2bd726313b9dde7a4
 MISC metadata.xml 252 RMD160 13550896f405ea2c00c68851097c455b13211ea8 SHA1 66fb63761a7800e71fa8d88244676f588c1e3490 SHA256 2bda98dae8fab414bb0fe138ac6cc256ad1bbdc031937ab18990674fc58f1e9e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkyOw9MACgkQTwhj9JtAlp7JcAD+L6QdcrcbALOSzty6weBcj8no
-vL0yvT+6jwwkCD4IgUUBAIEV4/2E/9BOlVZgZbKoxncgM7UZZF1u7CeuoBmmIVdJ
-=q+4o
+iF4EAREIAAYFAk0eRbwACgkQaC/OocHi7JYIUAD/cYVjzqHCWRcR0ffv14OfVKmV
+wCUxba6BW1GJiwePa+8A/20ytWSmikvkcPATFZ9jYg/wep7B6NFMtVJrxm9sUghv
+=BGfi
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild b/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild
new file mode 100644
index 000000000000..00a54aacd7ed
--- /dev/null
+++ b/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.2.50.20101117.4.15.ebuild,v 1.1 2010/12/31 21:06:28 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} ]] ; }
+
+if [[ ${PV} == *.*.*.*.*.* ]] ; then
+	inherit versionator rpm
+	# fedora version: gdb-6.8.50.20090302-8.fc11.src.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
+
+PATCH_VER=""
+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
+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=""
+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
+	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 \
+		$(has_version '=sys-libs/readline-5*:0' && echo --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}" \
+		libdir=/nukeme/pretty/pretty/please includedir=/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
+
+	dodoc "${WORKDIR}"/extra/gdbinit.sample
+
+	# 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
+}
diff --git a/sys-devel/gdb/gdb-7.2.ebuild b/sys-devel/gdb/gdb-7.2.ebuild
index 71a327616b93..09e896846b5a 100644
--- a/sys-devel/gdb/gdb-7.2.ebuild
+++ b/sys-devel/gdb/gdb-7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.2.ebuild,v 1.3 2010/09/14 00:35:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.2.ebuild,v 1.4 2010/12/31 21:06:28 vapier Exp $
 
 EAPI="3"
 
@@ -14,12 +14,27 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 fi
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 
+if [[ ${PV} == *.*.*.*.*.* ]] ; then
+	inherit versionator rpm
+	# fedora version: gdb-6.8.50.20090302-8.fc11.src.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
+
 PATCH_VER="1"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
-SRC_URI="http://ftp.gnu.org/gnu/gdb/${P}.tar.bz2
-	ftp://sources.redhat.com/pub/gdb/releases/${P}.tar.bz2
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
+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
+SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
 
 LICENSE="GPL-2 LGPL-2"
 is_cross \
@@ -37,7 +52,10 @@ DEPEND="${RDEPEND}
 	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
 }