Adds patch to fix regression in checking for pvr

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA8C8FBCF

4 files changed, 71 insertions, 11 deletions

diff --git a/app-admin/webapp-config/ChangeLog b/app-admin/webapp-config/ChangeLog
index bb6752cddab3..fc79b52375ce 100644
--- a/app-admin/webapp-config/ChangeLog
+++ b/app-admin/webapp-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webapp-config
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.135 2015/07/03 20:29:17 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/ChangeLog,v 1.136 2015/07/11 03:17:24 twitch153 Exp $
+
+*webapp-config-1.54-r1 (11 Jul 2015)
+
+  11 Jul 2015; Devan Franchini <twitch153@gentoo.org>
+  +files/webapp-config-1.54-pvr-check.patch, +webapp-config-1.54-r1.ebuild,
+  -webapp-config-1.54.ebuild:
+  Adds patch to fix regression in checking for pvr
 
 *webapp-config-1.54 (03 Jul 2015)
 
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 3c24a4eb372c..5441440812e1 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -10,23 +10,24 @@ AUX webapp-config-1.50.16-update-servers.patch 2565 SHA256 4fb781ffd1670de3978f0
 AUX webapp-config-1.51-fix-indentation.patch 820 SHA256 ba492885bdcb0263152a727f0ab790873a29208491573c02bb432d92930d82f1 SHA512 7a07df87a8304e2154b9a03dd4eb648eaadd4be8db70adf3c9c80fb46f2652b6ed67454ccfe64bec37d576f088eac88b829e33a81879dca06b6f9ded02587e3c WHIRLPOOL fa1b0a8dc72ecd7757a2dcb0ba2cc5d56611d10914c231a98871aa3873a0a559fe30724113a298b235ea6a4f0143198c0b4367d973db1c0f03be45c69df01324
 AUX webapp-config-1.52-nulls-doctest.patch 9054 SHA256 d29b81b0c5836e0258a5cf6f3f6e44b92a861e5f181c6acb7f2c3d897fe9a997 SHA512 3e1fa14a1db1a3c6fe505d846e40c47b91d75ffea52daf4f34e9da0713b954b47264d0b4f068e9736bc3d100ee981b461888b9ee8cde9103dcd86eb1b5f5a47f WHIRLPOOL bfa1728d72bba541f516263118d4cf3233b64d41ece32380c8096f33e08f6a6d102496982da95417391cfdd2f9a6d0add33a1ac683251e89b46e431fc49f8c2c
 AUX webapp-config-1.53-sources-function.sh-from-lib-gentoo.patch 756 SHA256 83ad478f41ee6a6035a5c3d492129cee8dc28ce068216ca36db8e7ce323e04b9 SHA512 e67f8e055bd0af7b97eade6dfce40fac411374dc264952ef1f17ffb5a161eed015bbbee512e83e1b533cef352c7dc863a96fa2345ecedaaa72352ddb622b820d WHIRLPOOL 13f4d1462456d6dd6097fe36a537a931a751056ca5e9281cd2e7476311cbe4ce776305532d876bacf86f95b137d61d3d2691d624c75fa61d4d78ea8476371fee
+AUX webapp-config-1.54-pvr-check.patch 2095 SHA256 58d606273b33631fcfa3a4b444811a742a6dce7c1078efbbaa124787e80f0ae1 SHA512 ee1c38e467ae4670b84d7b8d1cd8d99544898f8816dcc1cce37afb7ae3b8ecdce49f1d61f7f2e2609ec1166c5dffaa639e0705c017f18d0c3b50e72baf99aa96 WHIRLPOOL 9d2bf46d6e353fb85b3f739016d276aec1fef029617e3e72a1a72c492459c9d7bcf3737bc90210892828ddb8dd6a18943a34a29d4f15392038f1bd81b90d7697
 DIST webapp-config-1.52.tar.bz2 62951 SHA256 b8295bbc518f68f60913fe2ee9232d77f1a10e21fcddffb8c4370546ba96a2a5 SHA512 ec616067588e6ab306af067e70bab9d17961aa675f387ee67a2291235ce81638b49a784d9a6c31891b7c78a712f276c3e62c6681a5e496a52c7e6fe7753922ea WHIRLPOOL ca6484871e26acff6d14510a4a925672258f58c1c8c05c5207b78350b1cc787e29c6ea68c1af05b5c5aaebed12ce545e023f54acbdc7215678b30a2f14708eee
 DIST webapp-config-1.53.tar.bz2 63429 SHA256 4d45b1452feb730cc55bfdce686277183acfd64ab6aef5fab82992d1a508263d SHA512 7d2fc7197d537f2264c26b68b61e69273d2fcd3eec93657db54ba685c8383e7b8245cf05ed2ddd8b72453bf3fbf8f4bc4867e53d608331799df2e6162be14820 WHIRLPOOL f12ca0f3fcee31de6e2ead3cd3685fa32c697d258324bf40fc2bfc2f1787c4e7cbd7290bbb5f5523515bff29cb78bece35fcad390e419cf5dd619e5efdafc1dc
 DIST webapp-config-1.54.tar.bz2 58954 SHA256 7663c4f7ae0d4e7206e349f3bf79fed479c9971365363929f431c92ebd622d17 SHA512 fa61e88696eaed130575e5ae9a17ec827aa14aece359e5ba43fa723ad00083def22e44fb02d99fc5ba6000a5949c5ce7aecea9307d2bfae333e202ef111dcd31 WHIRLPOOL 417944147e0bdc7eb1575b10102230306f6c76652beeb0e2866d0fbe41b12bcdeb31421dd7551961db55f4fe4544ca5600c072cb74083621745c7c74fbfeec2e
 EBUILD webapp-config-1.52-r1.ebuild 1728 SHA256 9ad92769c2a6b092b6057167be7b5eba6522dff48ea6586b341b7cb0af54ae2a SHA512 c89a9dce5a0c2952a311e1db4f4ab8f7edcf868024dc90a0677c80d16ab856b5e04d8c216099f65e110573b27c634f8ed8b5fed71b611218f7ded2e20ddac324 WHIRLPOOL 2bdfd6b437ba0a8adbf835b82905d5de969333cf10e3772902b0baaf32c9bab648a73ac38da962820f9485c186bb527f2540048f1b9ae35c8862b1f2d2709962
 EBUILD webapp-config-1.53-r2.ebuild 1812 SHA256 fe50f0ed653e771d368090a9ffbe1dd1a0b31d0bb5efcafd4f79ccce7dc4b841 SHA512 0aa8fcadf6f4a19e752b43d05f521eff38ff002b76adc103db63ccf01e6eb7d3fcc0731b40331e764d385419bc2aec2407e078529a342baae2e8b63f97c09d45 WHIRLPOOL 16cbc2adf2383a6f396d934ef273958301b731f84538b0c971456ab6d30b36552fc29eb8568a827677c2a269d01db7f2da5f3bdf4293d8881a87af4120b483c6
-EBUILD webapp-config-1.54.ebuild 1752 SHA256 704cc0b07d818df709a7014892e684e9f8365c72dc7d9e8451717efdbac8abff SHA512 618939d24f4eee92cf4c9734b04a41849ee3ed15ef6e13d365fd7ad6de67ea3dd93a58afc5129b1826d9e76b3c021f7fdcf8910619e64fb93c7d4659e010acf8 WHIRLPOOL b36770b3c7d5565b3454eecf647cd6086bb210fb2650d8cbc2cfa5a7e95983605d5e7ef454479b28d0d5118860c80402a92da4dd303f40fbf51bb8e0c02c647e
+EBUILD webapp-config-1.54-r1.ebuild 1819 SHA256 1be901de757eb305f3955e284f8d4413ee87bf0b0a0d9a0c8b2765cd8d99762a SHA512 f359c9535df1ed518392f3dec10254d1781f542b088f3c18cac6f96834efa2279f9a347c51ff264bc980561207de4896948fd2f406512ad1812a3a3afe01fc6b WHIRLPOOL 17e58689a83017403e0b860b3f27927abb2846aa65bb7285791f4d0f11925678e2adf76e4f98c9cf1504503c10ff55936d21bbcc5623ef5fe6c13053f12ea56f
 EBUILD webapp-config-9999.ebuild 1830 SHA256 b7f7535cff4caed73f84f8e69009b612bb1d2787e1553da88398c55846a2f591 SHA512 6a9c1ca7cbffe64c0a0d1e29966e3c450a0bd388d59af1fcfe7e2f508e1f2aee625cba0664c5dce8c15d900be57c86084aef13b673d8caa216edbab28c4188ab WHIRLPOOL 514957b1a49c65a6a775943aa76bea5376be38ed1855a7e4ce07255822d5dd8843287ba4b8f884fa9538c24e92cd9c2b4e2916474a0806736fa3499cac46cfbe
-MISC ChangeLog 33372 SHA256 038937540efb8045bdeacd459f939310a6d5460043a1506af393105b9a946a9d SHA512 2ee7c0a22dfe9eadac5db2810a144d0e5ce7f7bd64114b3e677f9b50032997d05d9a1e9c1db3ac8d019ac95043bac27733e0279aa6d4d362145745b5a2d2f3d5 WHIRLPOOL abd69a7bc874f7e0f8da42d13ad72e4e3cebc3f6c01fbf01bcf2dc5b5dd9f312c206b130e3f4c5fafd78f06b30a13a0b55befe0c82279aebbc00938fb23178c3
+MISC ChangeLog 33622 SHA256 83f16eff7e62c960657f327d8c9c92f5619370557bafdee7bdaefdb24f091a3f SHA512 4f3b7b85148cc057761080ea69d1a99dc35c4149dee8356c274be4784d24cc18b17f92a9881bfd17e3294caaa0bc9edeb71ccdd1fe103a5c45cedd7a550adf25 WHIRLPOOL 628219e26cf3e7167bea5145a04b69d49fe3e597a2ca477d245c055c44766965910a4cafa21e1c7d31d9a1f904f8298f88941b621a3794460c704574eabdd1b8
 MISC metadata.xml 462 SHA256 c8bfbdf08140c41fd24a684e7e9642298dde3060c52054768f77a53ec78e125e SHA512 82fa9c21e551dab1bf71ee7ef2cf7ddf3bad6b3478a3701c2e90eaf06175f13d6b0965f163a2f30993ee6be582d9044cf947777c25b077f8424bcc09a96cb117 WHIRLPOOL 2e3efe5f154cbc0b68ad51da216b0bca2e2ce06d92c10166d8ec04b71ec63b532f8237c4d35cf1532e6a15fa41d3731147c05c46e036a14aceff58e3b5da85b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVlvClAAoJEEAKp6Qwg9Y3F4oH/iL34PBLWoMv45JzTHbGJ1Yn
-fUYtinX5NJtigH6AMwyeYxT9rhwj3w19WPD67c1XIQFAo5vTtSBskZ/idlZIM6Ld
-REUvUDIRuwZftnykOXK2s7vajtog8fLoU29lKLwqlGb1Ywte6HYXxa5aHnXDjaLj
-Gqp6icmhI34ziqQl+/OBTGWQk1RgZgnD7XQXJu30wCPyFQmA1Hhl4YNpCi8r6gFk
-8cITutK8JcM/fRpLqfr1eFj4bO6V2IYreeYvXsaxH/NmqJRqVKVteSmLHXmFkTFG
-/uCoVlnQpCTMeqMSa1xssKErfrZV+C1Ozn2eDGG4G/ngA2DmLUvQtO1hvceanvc=
-=Dnb/
+iQEcBAEBCAAGBQJVoIrvAAoJEEAKp6Qwg9Y3cCAH/0bShKFf5xyyRD+qMfutZAFl
+QufX2o7y1bCcKbSUfrWr58Lc08/GuCpV4lydvqeZzg4i2hzcb7KAa6vcorvovZrj
+LF61E3rfAiUvvNCQBU3XMlPc9sakmbC3qrPWKMysBmQtwz9KhY9mCoPOssym64OT
+bKzYCwD+EnBfTvnJx4pkVgsSCTX+oNnPtnd8VXwr0+Pt2V4+y01HL4F5sL/TOoL0
+FWSQlIjedW8WH+QVvNRycPUPAxHHPi07yA9ERfSAsE2kDfA0NIYJLGQOjArd90xU
+5iKOyQ3HAeZRw8+wBRRt0Ek5K2VtHdhs60+Xo8slZ+D+O1yiYDXnbOfu7UNSi2w=
+=mqoX
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch b/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch
new file mode 100644
index 000000000000..9a35ad70cafb
--- /dev/null
+++ b/app-admin/webapp-config/files/webapp-config-1.54-pvr-check.patch
@@ -0,0 +1,49 @@
+commit 9e251c7574d074e424ea19024f743c754f321979
+Author: Devan Franchini <twitch153@gentoo.org>
+Date:   Fri Jul 10 21:25:17 2015 -0400
+
+    config.py: Fixes package version checking regression
+    
+    Previously webapp-config would not do any sanity checks when
+    setting the package version. After adding a sanity check in 1.54
+    I made the mistake of not being flexible enough and this caused
+    a regression that prevented web apps with versions such as
+    "20140929d"[1] to be installed. This commit fixes that while still
+    allowing for some sanity checking.
+    
+    [1]: https://github.com/gentoo/webapp-config/issues/2
+
+diff --git a/WebappConfig/config.py b/WebappConfig/config.py
+index 6c915c3..3a176a0 100644
+--- a/WebappConfig/config.py
++++ b/WebappConfig/config.py
+@@ -996,17 +996,20 @@ class Config:
+                     OUT.die('Invalid package name')
+ 
+                 if len(args) > 1:
+-                    argsvr = args[1].split('.')
+-                    if len(argsvr) == 1:
+-                        OUT.die('Invalid package version: %(pvr)s'
++                    pvr = args[1]
++                    has_int = False # A package version should have at least one
++                                    # numerical value, but we want to allow for
++                                    # the flexibility of having any alphanumeric
++                                    # value while checking to make sure it's sane.
++
++                    for char in pvr:
++                        if char.isdigit():
++                            has_int = True
++
++                    if not has_int:
++                        OUT.die('Invalid package version: "%(pvr)s"'
+                                 % {'pvr': args[1]})
+ 
+-                    pvr = ''
+-                    for i in range(0, len(argsvr)):
+-                        if not i == len(argsvr) - 1:
+-                            pvr += argsvr[i] + '.'
+-                        else:
+-                            pvr += argsvr[i]
+                     self.config.set('USER', 'pvr', pvr)
+ 
+                 if (not options['dir'] and
diff --git a/app-admin/webapp-config/webapp-config-1.54.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
index d5fb8f0854ac..be963a8c5afb 100644
--- a/app-admin/webapp-config/webapp-config-1.54.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.54.ebuild,v 1.1 2015/07/03 20:29:17 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.54-r1.ebuild,v 1.1 2015/07/11 03:17:24 twitch153 Exp $
 
 EAPI="5"
 
@@ -22,6 +22,9 @@ DEPEND="app-text/xmlto
 	sys-apps/gentoo-functions"
 RDEPEND="portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 
+python_prepare() {
+	epatch "${FILESDIR}/${P}-pvr-check.patch"
+}
 python_compile_all() {
 	emake -C doc/
 }