Rev bump to add patch for local overlay listings

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

4 files changed, 47 insertions, 11 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 0cef13403726..eeabe72a4128 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.199 2014/07/24 19:01:48 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.200 2014/07/27 03:17:20 twitch153 Exp $
+
+*layman-2.1.0-r1 (27 Jul 2014)
+
+  27 Jul 2014; Devan Franchini <twitch153@gentoo.org>
+  +files/layman-2.1.0-local_overlay.patch, +layman-2.1.0-r1.ebuild,
+  -layman-2.1.0.ebuild:
+  Rev bump to add patch for local overlay listings
 
 *layman-2.1.0 (24 Jul 2014)
 
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index a5bb86111351..b816a63519d1 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -3,22 +3,23 @@ Hash: SHA256
 
 AUX layman-2.0.0.doctest.patch 933 SHA256 929fe74035671d2b95c61464f3d83c9c16069293f5fc24a93f3a88083649ef4f SHA512 37a3bf04ba5185bf7f885321a4a925e24218d6e283b4c9d85e4935e0fb3dacf4fa543fa79e146c44bcbf833e7348dc49270cd0baa562a5e2539fc792b91abaf8 WHIRLPOOL 593deab62ed74124b386d6167283ddb08ba2c004c32288501697d09bf0e611067ed2b49bf52596543c036ac5a434efea63dd30f715815bddea97d3c05198bc84
 AUX layman-2.0.0.svn_upgrade.patch 2447 SHA256 a0c1bf027cb63b9000b58d67a419198c7311514d31a78862db9203a0e4808362 SHA512 a3b9d0a0049aef011ddaadc627c38c9730e547aa4941fc1081ea7727f228e72080314a1cc376fa96ba23efe365529795a1b501c90b76561f6c4bff9aba72eb1f WHIRLPOOL 921529390429f8c4cd008769438ba005e01104a45bb0a966827a9dcf19089f0e16cc3ccf434fe6eb1c6947db0f4f7c7c5f9ab65bfba9f7a42bb17f343e8e9865
+AUX layman-2.1.0-local_overlay.patch 1039 SHA256 6bfec3e5befcba9adb5839f77136cd7c9e52f2aeef5ae50dc879d0ba416fe19a SHA512 7de5fbd980cd591c9b8815a4a2b24a445ffabc5ffa3b2fabb11bc237d13812b44e8b4363185cd7bd110dcc09dd83ceb5f78786f2410cd39a54b47e71f6f988bd WHIRLPOOL 0e9afb2bbc6eb33718152e584a80cd34fbd0dc88c2ad395d1e562364c382bb11482a66e4725186b49ed79195f1916811630d9d358801ee795e2ba0a043039f89
 DIST layman-2.0.0.tar.gz 81184 SHA256 5843035ae4cc069693c05cf9821dae3d89d3ea7e2115b8137ea5a4a6c2807f33 SHA512 30756464d71ab1e047036550b6500d7e57999d808ebe3efba1d1ae6c037f8ca777ba704a4981d75a90285133635027a7bc13f1890f34823de33ae991ed99e2da WHIRLPOOL ec362189c4757ee032dc93e079ea0f5b291d5652231a84f1175fb308ca5622882d5008f23fd6a3d5143ff0dc98c91632d19c2e6604dcaa9b6a550bc902d79c1a
 DIST layman-2.1.0.tar.gz 94150 SHA256 cb96306c84da1d49ff54a31f7511c62c859565361bd59164516cd2812c439987 SHA512 1fa21392157c811c7751b8e3a11b858308c48720e377871bdd5afc525ebb50a92772064aa1148a4c20e3019f77b676ff65552439a71361d498952e362398c67f WHIRLPOOL 77643bedb4167eb371357444328d439c8b433cfc22a8bf9e39693feb68b701ec158064db8d22da0e6eb5260f27d5604d8b252a67930b38d8bed5921822f71c29
 EBUILD layman-2.0.0-r1.ebuild 1794 SHA256 21f8fbad6d554b7d174e7b4530c73ca2c84611a3c2cdec138a58c0141a5c386f SHA512 ccfd9b8bbb9a9c419973a80de00c74220af898615f4b72dfe3ed38a39bab0024313ce2f9d7de20b6f023b9acc258f6015b549b08a2056e91fcba41b14cd41282 WHIRLPOOL 2cc3986c877587ab38bba2778617b87458ccb6a7b20f9dc10cd4b1916100f1af83b36787daacae4bf94cb64e55b0d005396807e549c9899c5ddbaffe9837848e
 EBUILD layman-2.0.0-r3.ebuild 1835 SHA256 62f560bd46b094d6981ce37123b38f98fff14dc6e1aaf1ee5b1968eca2be3b8b SHA512 1f8548d731b657b6b8ef031a8baf87215d6090bfaaf7dae317874b13d47460dcc9829321200996dcdc90de6697344ba4fa23f4adbce3d62ae92f1d20022dae2d WHIRLPOOL bbed66863cd22bfb65304cbd3358a9ad28c62457786be5cef8216259118f89a445d2eb040838bb2ee407a9168e0837b54d16239b2db1604a863a0f3c1310a3bc
-EBUILD layman-2.1.0.ebuild 1817 SHA256 31e96f4765fe639e95e03e5be17232800756e13bda2fd008d6fd94bbda522156 SHA512 31b8eb08caf22ebee968ea70a5bd1e53cb8575a1681492c04680022dbe8fd14c8604bf702d4842c509c4dc96b697140e90a3ce917b7fdfdf57c8912d046fa156 WHIRLPOOL 749f58c6cb086a7e833155ad2356d9309116db4f0f68b81753602fba9eec2f1ef87f2ac5a798d6d9e6558c3d5553ef131067b6b8895b8ea420c410c450b2309a
+EBUILD layman-2.1.0-r1.ebuild 1867 SHA256 27b79b5ac1e23f0715dabd9eb7c966b550ca8dc0b43c1e0fd88764c6581e0f4a SHA512 8566e00849b05ad6368f84cfedfa03fac3891b3ca35558935ec1acbec5acb15954f7c4f5273423bf2d167d9f1b28aa8702a1bc1b3d034871b3d7f1f883593100 WHIRLPOOL 6445bcbebf10e0cf0101da5a74c64c90714b08c67ac6d368af027ccd2447ded91392d9594c7df5e2cd6e9da44ddb0f98cf9489db7ec71397d9fe1e9f3a2d03fb
 EBUILD layman-9999.ebuild 1755 SHA256 07ca8be9e73ede530d0659038c1bec90df613aff7aa313442286998dc5eafbd2 SHA512 2a707ee87aad01b70945a7b9d6c44264d6a437a0c4bb2dbe856b286a098271170657b3acc5ebb4bdfaac5a33cf0ec1ef1d8f55f0ccc8324a3fd7d980a2f6c8b1 WHIRLPOOL 6b9baeb1eba7bdcf8bb721271fd6171c6edd2c5641f22cd773e32e2e452bcfbb882daace690ed32416e3a5f9b75eb0e514dbc9f867a6e02101d62e5acaae987a
-MISC ChangeLog 29716 SHA256 c06029e7faad8330d0a69b0b9a79cbd730dd53cde354222b5e7a8fb4d23fdc8b SHA512 8030e5f157d9cb272296a7bd805ff9de2094df50ab136aab331dc4e2fcbed353ceffdcc3b8f0632b5ed56c90d002fb3c41a582791ac32ba903355a464aa8d598 WHIRLPOOL cd27ac9e47a03659b8df50c9e64fa096891661ee54bfd4e2a3e33df1931d2f165da82a94ec8e78b00bc73cac8375f7db05b32cdb083d7a5eff3236ac59f40fa3
+MISC ChangeLog 29946 SHA256 0b36613ce815b26301a1587c154847feb3694ce95a229981e2ab7c6d165ad1ce SHA512 870d68362c316c9293cd3d15f5834e7fb591f94aaa7daebcea4b9a9141af7f406598f676e6e8876d5145add3dba068565fd3670e943e3e0507a15c60a064ecca WHIRLPOOL ead9baf0ca9a7d843da8a614b7269e807762719301e08bacdc4c18ce4953dc912250cf44ba961874205304d2727a8c967992a4ddc453170de41c7b72a5c009c5
 MISC metadata.xml 836 SHA256 3aaac2f91eb9af7ded8b8c7c2850a59af0fbc9dc9ca0cb013b718e491b28a3e4 SHA512 fa3aca7820dddaaa3c2860bb5d9ba7da492d0cc89d00873c930531e12b6c0dcda934cdb25ec3a9dd3b6e131a97f2019240299354263cd480d186692a5ee49e9c WHIRLPOOL 4e1a86b99846aab594510bcebdca54266706ada289b99513bc2d4c928a89746835cf3e0be03668b038c778d6c96b690e55ab4735bd2a12aca05728fb914a8e15
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT0VgkAAoJEOf5eU+oyPvPcYEH/35tVueBazyWCJJqPz2+iaLK
-sHzJNnfaOTjYFfjbNrx7i9TC4KwMvNb32lnWo8ptFxZJtyXGwas/7s1pZLcBkAFi
-riRRCw954FAqpZSM+D2MAgoi5KJi/yrXCFjLVHi6VnDyvtpr3Iiqm5SLbSthc8SN
-KuR1G5/1kYSb6feqs2wTALsWOca1KP8D+M/Z22NsQR11rj74zsgM+zfqJUwUIv86
-FNsmI/Z/PIpshIn9Iy5P1s8icQy8YNeQWtqxgUokQs3H0Pmoa41gxhB+s5ABCeyP
-aNFNXiBzbM9ljGUPKi3WtpJ1gZmaqbcCuMNX+zc+8gO8wWsYoLktNJwI8z0R6Wc=
-=vT+z
+iQEcBAEBCAAGBQJT1G97AAoJEOf5eU+oyPvPWHoH/Rf3krETcCciUyY4JAPyJPzb
+R+zj54E530siBBrZtTjUXjdypA/ozX+3bGnDscvFwX6OvgNrjrNoyGX+ZR5OMJ2E
+y2MIJemJfjhhr7QmMwQn4Rjh/I9s71zQfGUVmyLAetkRJvpbX5qhejlA64AQfdlp
+ZXXzUL7MseJt4TY8ZzH6aqWp95g3dX0WGBl0cxzLgczqavi4q/JTGv2RPT3xy3d1
+ySCUTgqk86hYm48k2bTPsrTPdjzGF13whdyD+lHuvsptyVr26ZELIvY5CsXnsggJ
+JBfJG8IgWbfB9+aOzvSWNj+/+WEwFdr+r+Cj1hv+Cu+j42J+wyHJZsKZt2vGojo=
+=0InA
 -----END PGP SIGNATURE-----
diff --git a/app-portage/layman/files/layman-2.1.0-local_overlay.patch b/app-portage/layman/files/layman-2.1.0-local_overlay.patch
new file mode 100644
index 000000000000..fbe5cd0e8137
--- /dev/null
+++ b/app-portage/layman/files/layman-2.1.0-local_overlay.patch
@@ -0,0 +1,27 @@
+From d0e5d9120c27f678e9039bb2f65cfc0e457be6c7 Mon Sep 17 00:00:00 2001
+From: Douglas Freed <dwfreed@mtu.edu>
+Date: Sat, 26 Jul 2014 15:54:11 -0700
+Subject: [PATCH] Fix a bug when an overlay isn't in the remote list
+
+If the overlay isn't in the remote list, it obviously isn't a different
+type, nor has its URL changed, so just init those to False so we can
+sync the overlay without hitting UnboundLocalError.
+---
+ layman/api.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/layman/api.py b/layman/api.py
+index a86970f..930f449 100755
+--- a/layman/api.py
++++ b/layman/api.py
+@@ -426,6 +426,7 @@ class LaymanAPI(object):
+                 message = 'Overlay "%s" could not be found in the remote lists.\n' \
+                         'Please check if it has been renamed and re-add if necessary.' % ovl
+                 warnings.append((ovl, message))
++                (diff_type, update_url) = (False, False)
+             else:
+                 self.output.debug("API.sync(); else: self._get_remote_db().select(ovl)", 5)
+ 
+-- 
+1.8.5.5
+
diff --git a/app-portage/layman/layman-2.1.0.ebuild b/app-portage/layman/layman-2.1.0-r1.ebuild
index 5754978535c6..1cd42a19b9c0 100644
--- a/app-portage/layman/layman-2.1.0.ebuild
+++ b/app-portage/layman/layman-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.1.0.ebuild,v 1.1 2014/07/24 19:01:48 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.1.0-r1.ebuild,v 1.1 2014/07/27 03:17:20 twitch153 Exp $
 
 EAPI="5"
 
@@ -40,6 +40,7 @@ RDEPEND="
 
 python_prepare_all()  {
 	distutils-r1_python_prepare_all
+	epatch "${FILESDIR}"/${P}-local_overlay.patch
 	eprefixify etc/layman.cfg layman/config.py
 }