add support for USE=vanilla

Package-Manager: portage-2.0.51.22-r1

2 files changed, 33 insertions, 21 deletions

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 877813931d64..a3ae4c1aa297 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 2a52c4cd9bf5e2667c6bc7312e179fa0 gdb-6.1.ebuild 1807
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 93827ee04453324bacd51781cf0c9246 gdb-6.3-r3.ebuild 2997
@@ -26,3 +29,10 @@ MD5 1da0dcdbff7ba48a06350a28ecdd238e files/gdb-6.1-ppc64-01.patch 359
 MD5 37007f485c9f93564f99675e59b65e7f files/gdb-6.2.1-pass-libdir.patch 300
 MD5 c6dfff1373e52fef5872c1bdca4cb706 files/gdb-6.0-info.patch 1108
 MD5 a4610ec65e88f73e0b00b525467a5372 files/gdb-6.3-scanmem.patch 6652
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1ePDgIKl8Uu19MoRAt1oAJ9XCPqjEN23YtjC2G2RjNthpj70kQCfSdya
+IzRJef5vhYiS8+WF23O2kek=
+=noBm
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-6.3-r4.ebuild b/sys-devel/gdb/gdb-6.3-r4.ebuild
index 566725ac10ea..6f661620ec6d 100644
--- a/sys-devel/gdb/gdb-6.3-r4.ebuild
+++ b/sys-devel/gdb/gdb-6.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.3-r4.ebuild,v 1.1 2005/07/09 23:44:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.3-r4.ebuild,v 1.2 2005/07/14 04:00:45 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -15,16 +15,15 @@ DEB_VER=6
 DESCRIPTION="GNU debugger"
 HOMEPAGE="http://sources.redhat.com/gdb/"
 SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2
-	mirror://debian/pool/main/g/gdb/gdb_${PV}-${DEB_VER}.diff.gz
+	!vanilla? ( mirror://debian/pool/main/g/gdb/gdb_${PV}-${DEB_VER}.diff.gz )
 	mirror://gentoo/gdb_init.txt.bz2"
-#SRC_URI="${SRC_URI} mirror://gentoo/gdb-6.1-hppa-01.patch.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 [[ ${CTARGET} != ${CHOST} ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~s390"
-IUSE="nls test"
+IUSE="nls test vanilla"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 DEPEND="${RDEPEND}
@@ -35,23 +34,26 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	mv "${WORKDIR}"/gdb_init.txt . || die
-	epatch "${WORKDIR}"/gdb_${PV}-${DEB_VER}.diff
-	for f in $(<debian/patches/series) ; do
-		EPATCH_SINGLE_MSG="Applying Debian's ${f}" \
-		epatch debian/patches/${f}
-	done
-	epatch "${FILESDIR}"/gdb-6.3-uclibc.patch
-	epatch "${FILESDIR}"/gdb-6.3-relative-paths.patch
-	#epatch "${FILESDIR}"/gdb-6.x-crash.patch
-	epatch "${FILESDIR}"/gdb-6.2.1-pass-libdir.patch
-	epatch "${FILESDIR}"/gdb-6.3-scanmem.patch
-	epatch "${FILESDIR}"/gdb-6.3-gdbinit-stat.patch
-	# sec bug 91398
-	epatch "${FILESDIR}"/bfd-malloc-wrap.patch
-
-	epatch "${FILESDIR}"/gdb-6.2.1-200-uclibc-readline-conf.patch
-	epatch "${FILESDIR}"/gdb-6.2.1-400-mips-coredump.patch
-	epatch "${FILESDIR}"/gdb-6.2.1-libiberty-pic.patch
+
+	if ! use vanilla ; then
+		epatch "${WORKDIR}"/gdb_${PV}-${DEB_VER}.diff
+		for f in $(<debian/patches/series) ; do
+			EPATCH_SINGLE_MSG="Applying Debian's ${f}" \
+			epatch debian/patches/${f}
+		done
+		epatch "${FILESDIR}"/gdb-6.3-uclibc.patch
+		epatch "${FILESDIR}"/gdb-6.3-relative-paths.patch
+		#epatch "${FILESDIR}"/gdb-6.x-crash.patch
+		epatch "${FILESDIR}"/gdb-6.2.1-pass-libdir.patch
+		epatch "${FILESDIR}"/gdb-6.3-scanmem.patch
+		epatch "${FILESDIR}"/gdb-6.3-gdbinit-stat.patch
+		# sec bug 91398
+		epatch "${FILESDIR}"/bfd-malloc-wrap.patch
+
+		epatch "${FILESDIR}"/gdb-6.2.1-200-uclibc-readline-conf.patch
+		epatch "${FILESDIR}"/gdb-6.2.1-400-mips-coredump.patch
+		epatch "${FILESDIR}"/gdb-6.2.1-libiberty-pic.patch
+	fi
 
 	strip-linguas -u bfd/po opcodes/po
 }