From: Mike Frysinger Date: Sat, 13 Aug 2011 18:02:18 +0000 (+0000) Subject: Add support for live git trees, and merge the different versions we have for fedora... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=14721f5feb44cb5f2a7d42ad487ec92dfd82417e;p=gentoo.git Add support for live git trees, and merge the different versions we have for fedora/weekly snapshots. Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64 --- 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 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 gdb-7.2.ebuild, gdb-7.3.ebuild: diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest index fb15481571d8..5c586ce454c2 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -25,13 +25,14 @@ 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 3105 RMD160 8a72e6629722cb7e38d3037aee3e212c20162517 SHA1 5de0b69d8fb26d2f81dc78d9ab104c5502fda0da SHA256 d75a24af2ea526e773bb9b01b99e2272f49e4fc31b32d3d93738cd3e739508af -EBUILD gdb-7.3.ebuild 3114 RMD160 a362aef2610f9a0bca3512550948199c695874a8 SHA1 464679723def670179dbcad567d2736170223673 SHA256 0a40db82b54babbb2ea8925dc23c4e220d6bb379f9ff56e8bee9951a6d241f5f -MISC ChangeLog 24650 RMD160 06c3397ada6e050c98126f8366bd346bb17b00cb SHA1 f72300b10a3766315b5388d150aa1b35da358cd1 SHA256 84ae33878421e84c4970a11eb37a405ed57eea7bc38f2e130a5c49c8bf65a558 +EBUILD gdb-7.3.ebuild 3351 RMD160 1888c629a80b6aeb18d3f0b0da5c42d229ae0215 SHA1 70d1ac316f87d74f08bf92a6e727aa692f1620c3 SHA256 6a69af736a2430d5b213523cfa6434eeeb4ee562e41ee25004f0364c1a695a79 +EBUILD gdb-9999.ebuild 3351 RMD160 50aee8160f0ae60de7a1f161d344176ff09f05e8 SHA1 f9fc42dc2ca6231951c4a8224d2afd58afaa9649 SHA256 800a9b077b8981541596c138d743cac41e3da776302069ce6d9c0ed82cb253b0 +MISC ChangeLog 24868 RMD160 796e38b2ca68cb61ebdb5bca06ccd2a72dc050d4 SHA1 06a390be4a4e3c81544efb8b6e39af89e89aa440 SHA256 ff327e3df0a6d4a41b879327c417788b656a25a7da3cb9819c81b5058ed7ac77 MISC metadata.xml 252 RMD160 13550896f405ea2c00c68851097c455b13211ea8 SHA1 66fb63761a7800e71fa8d88244676f588c1e3490 SHA256 2bda98dae8fab414bb0fe138ac6cc256ad1bbdc031937ab18990674fc58f1e9e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk5GuSwACgkQaC/OocHi7JaOMwD9GWa0Els0WR92ZcfzOytBmjwy -CmMJ7qAYhQH8zrWCq4wA/jvN08plKl3Ajfye41v7w3fKUzyBCxuMDsEO98u0zI11 -=vOrR +iF4EAREIAAYFAk5GvDQACgkQaC/OocHi7JYjcQD+IFr2B+qYl/JElL12Mg2D4uer +Y2XoNipZveqzM5erAVUA/1DZbtZEJjKYz50ep9z4muYL2qyt8jT2RHu57KW+7iqP +=0ZvG -----END PGP SIGNATURE----- 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 +}