Do not mention the PATCH_VER in the version branding when USE=vanilla #400707.

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

4 files changed, 26 insertions, 21 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 3554d5c6d1c3..61640fa24026 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.207 2012/01/25 04:34:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.208 2012/01/25 19:31:42 vapier Exp $
+
+  25 Jan 2012; Mike Frysinger <vapier@gentoo.org> gdb-7.4.ebuild,
+  gdb-9999.ebuild:
+  Do not mention the PATCH_VER in the version branding when USE=vanilla
+  #400707.
 
 *gdb-7.4 (25 Jan 2012)
 
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index c73667310b99..01e2c72cf738 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -32,24 +32,24 @@ EBUILD gdb-7.2.ebuild 3498 RMD160 97d6ae6747660a07b8587d1c9bd92d99fb4261b4 SHA1
 EBUILD gdb-7.3.1-r1.ebuild 5137 RMD160 371e54c475bc62420c510f2b66b9f8e38ac10812 SHA1 98a18fba1de23462afab4f379eec5ba8f6d29290 SHA256 dad0ce923b3bd5b97facbfabeb6c80dea2e055b216ea2a649e9a87cb6ca928e6
 EBUILD gdb-7.3.1.ebuild 3888 RMD160 96974bafb2434a05c3a552384fe861215567d6cd SHA1 93eefb1f8841775bffd24a08ac4953ebf17790bc SHA256 926218f81698c60c724ecd87c927fd9e0256365642f9d827f8f15ea4f236a7b4
 EBUILD gdb-7.3.ebuild 3801 RMD160 59f24f3a7276a440fc4162863d52706febadea9b SHA1 a0a4aa9d51c7e5396d53e40536117b6c86277c30 SHA256 69aa29131061561ec60165e2f65e74a897ae2a5f51799ddce2c048a7a6606855
-EBUILD gdb-7.4.ebuild 5132 RMD160 01ac6c87e0ab88be3dcaca397900361b4bcfab6b SHA1 3020cfabe5665be34afd85ae3fdbf825d967a82b SHA256 6832f5a40c68084b70bc282e6370c5ce5bbadf751c28d98cad0918b77b81faad
-EBUILD gdb-9999.ebuild 5132 RMD160 41f8a0f48004f6e099107710db6d2b616f031e84 SHA1 4579c3566eb4d767124af94a943e3547d21907e9 SHA256 71491cf4626ed1873af822fa2ad9f9c412e16c079b8f8fef1390ea69740ad8fa
-MISC ChangeLog 27584 RMD160 c29d8ba9761efcd8e6e4cee85d0a54009bcf9d6f SHA1 d3185a1d2278fabcf9186c728f17f8c1039d78e4 SHA256 cdd95e50695822e5596507f409fb915d51d8ba9223faacfbaa3c8d2b42e0e28e
+EBUILD gdb-7.4.ebuild 5149 RMD160 cab8eaac3fdbfc35e6311bdd920114ce33c8b556 SHA1 5038be995279c6ea8657044f8bc57d2e56c96442 SHA256 4d44ecbf1db1f32d02f8e977b633255381b37e524a13f3e257676aeec9c7cce5
+EBUILD gdb-9999.ebuild 5149 RMD160 1b29620484879bca16f40aa4dcc13b26d8554269 SHA1 0c09093f5f997b877247b7b5db829413f678ab37 SHA256 3310465c1b094def75c364e8fe3cd2186438036d3058ded5684a491b0d0a68f1
+MISC ChangeLog 27753 RMD160 8d4d7c6ed048c8d3efe16d691b727486b115d09a SHA1 42d2cf5cbbe6984f22ba955333b35e96a701f527 SHA256 0c870928043d38526733b4501506adb2b5e7a53903ec50b5e239d4998f11752c
 MISC metadata.xml 552 RMD160 05c46fb5af7dc382b5977a47dac90f077ddf7b68 SHA1 2aab7d540d4b18a618bf34d962c63ae9f7e18aed SHA256 e86791dadf315a7a079e460854bcc4a28d7c69a93694efc85014b325824b81cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPH4aIAAoJELEHsLL7fEFWFGYP/0OvyNeZLtoWJBfDCV7iGYZE
-cp242Rddpt2YdfcU/KN7IbIAZ4nRLQzh3/AKV/LxQe2ndypj1QKpl94JMfbpEsf6
-PrAy4t1luI2n+1T1UC5Sa8nnqVU/XpulbrONpvunb+YOEG6NmUAI6Z6fYQJ5CbSj
-3bp/QHbdKFZpXiKUXvUn0B1P8IIz6zrEET+KjKpmsK8p9seDhZtfjAe8pK5vge/E
-rsfa7u+Cdf+l94Vrb12B9FIq8ZON8/lVNxU+3mWfeQDkZkPrvMSOCnb3TDW54lfy
-qgX02HPJV+0Cjz9ZOkabWDJA0vLI157Ia6k1Xjj0GiehYBC8QMgUUyDshkSB0gkp
-AqdTeGF3Zuw4t4tgqH/G3X8LzKWMt2JezjDX1b9hs6wRqeL/IVfx5ttl4rB7PsnA
-VEPXEu1x8QdSBXTN5IwcZB1uJu6NNx7OclAQdo/uMuCh6Xlw0B5mcWyKeZb53d0v
-O+Ddr5U99gTs2TP7c8EvyAAOW+9PhXpc7UC9XVKHSFUmzp1ZBeuZPfzW0lKT+mGx
-kcQsoaI9XcVTKHh7xG6tSWD08NchRchHw4nRg91udW1zpa5FglUIft842wMMxFE/
-ERFkqm5HasaTUCrkfUDaLjK2WVbEKcvGqWFtZ1q1/MtV9MlNC+BKzzPB9dnbitj7
-mx0d5pDMoGXATEVRhxW1
-=+cqM
+iQIcBAEBAgAGBQJPIFjRAAoJELEHsLL7fEFW1moP/0m0n1q10HnvGWMsAN8NZafu
+l+5N30EkY19mzgWjVYWalleismiIOAAPXc2TugRH407t1oXiM1PSZnsPY3BFxaz8
+g/ah7RfDqjdmwyVHkNftJ3aXcJCpXN38tELtsEffgCZwsIIEC1OgwGeiABBplLxm
+VeNlWi8W3rtujDAtj5BbW6Pndi0/GPCz0Hx8pymy7y4YQ3YjjsgKa/8nXHbMEzxe
+nahCgo9hib6OUHV2a/oKvpEKH7WXZLe2OFDi1mkZ7C9ScknyBfFkvU1virsChhGk
+tKDFJQKSQUSVbb56Vhhfl9ZtBfXBWYNP4xuxuuD8HICGibI+YeuzXKccTMl8tz+H
+KQ4IywUy+kcWGuv1h7ghfn2di+aV4M+fBcUzMBDau3KtmAnuemcYn15EgS2L2IJ+
+B3czcGBmF8DCZrtzKtbwuvMpeTZsrZExAaQb0jmb7oNSwpVdhWGkp6ZJ/w+HaTSj
+dGROvpCsRsRcNinR96Dy1MNHvu2xD3j6Wjw2dlrRMf8fP18mTCe9Dz4lxLjqoRj6
+xlIW8wcdLGdN7qeWjIK6atoi1YPaLe1bmp9a0QYkSEFlPleQApH8kkjtqHSDPh+O
+I5I070t2Q6hsLsD+wn8KLGvoRkZLeEGWd/vle/VUZSyeYo0f5wm/sz7GLPqJ8BpX
+goZoa5K5A1sbg0gQ5HeC
+=pGek
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gdb/gdb-7.4.ebuild b/sys-devel/gdb/gdb-7.4.ebuild
index 350ecaed4157..eb7bbe56c3cb 100644
--- a/sys-devel/gdb/gdb-7.4.ebuild
+++ b/sys-devel/gdb/gdb-7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.4.ebuild,v 1.1 2012/01/25 04:34:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.4.ebuild,v 1.2 2012/01/25 19:31:42 vapier Exp $
 
 EAPI="3"
 
@@ -76,7 +76,7 @@ src_prepare() {
 
 gdb_branding() {
 	printf "Gentoo ${PV} "
-	if [[ -n ${PATCH_VER} ]] ; then
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
 		printf "p${PATCH_VER}"
 	else
 		printf "vanilla"
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 840dead190fe..bd13cd3136ff 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8 2012/01/13 19:13:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-9999.ebuild,v 1.9 2012/01/25 19:31:42 vapier Exp $
 
 EAPI="3"
 
@@ -76,7 +76,7 @@ src_prepare() {
 
 gdb_branding() {
 	printf "Gentoo ${PV} "
-	if [[ -n ${PATCH_VER} ]] ; then
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
 		printf "p${PATCH_VER}"
 	else
 		printf "vanilla"