Move patch comments out of the ebuild and into the patches where they belong.

6 files changed, 23 insertions, 38 deletions

diff --git a/dev-python/python-gflags/ChangeLog b/dev-python/python-gflags/ChangeLog
index 96eab9f150c1..e3f3621522e6 100644
--- a/dev-python/python-gflags/ChangeLog
+++ b/dev-python/python-gflags/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-gflags
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gflags/ChangeLog,v 1.14 2013/09/05 18:47:01 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gflags/ChangeLog,v 1.15 2014/02/03 15:19:57 vapier Exp $
+
+  03 Feb 2014; Mike Frysinger <vapier@gentoo.org> python-gflags-2.0.ebuild,
+  files/python-gflags-2.0-scripts-install.patch,
+  files/python-gflags-2.0-skip-test-as-root.patch,
+  files/python-gflags-2.0-tests-respect-tmpdir.patch:
+  Move patch comments out of the ebuild and into the patches where they belong.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> python-gflags-2.0.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index 51d263d602d9..f6eaf6aab157 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,29 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX python-gflags-2.0-scripts-install.patch 859 SHA256 2f9dec0ad45249aea43701ce43eab8c49a4d423f9defcab84ee864ab4ba32f4c SHA512 38f3272bb6b392ede04ab3e8edaacd5e12fb9f0fbb16abfe0eebed251d08a1a8223840d38dae48089bc1d265c14a2e485045385b00d7d9a8714a063c489feda7 WHIRLPOOL ecf82010e8a831ca90d7feb3b26603b811df07be6e8b3140a179f78fefeedf5339014bbb25faefc4a29e2b7e8763f33d69b1e7e39c054594265ca25b508d7a67
-AUX python-gflags-2.0-skip-test-as-root.patch 897 SHA256 1bb89fd862f7c5cfc00e981bc8d2d737845d6508030411d7861e73a3da0ee46d SHA512 a6798292ff239cb3a36f1c97019a55f26d9c56620b9261db4434c1536e2f34f732bb9e87015173d9ed1e11ff5884ff38074e2ef30237e93749b48f6b88379ecd WHIRLPOOL 21128d27e6e1a421a18c1f32016dded5ed6a3a1463b1e9f4fc6e92cea80b1f65e061f50a22d19e0e06ba2be098731425dd53575d5a4dee0577b7b2105ba8a1e1
-AUX python-gflags-2.0-tests-respect-tmpdir.patch 1749 SHA256 dc11b5f239f4b955b99a642179dc27aee7778c2d19ef9be124c6256d7c84512d SHA512 cfc6fabe7fe1543d589cf130a3eb0360ac42bda3f5a1b2d1ef014af177874b44f05b18459c9915b8cbaf3fe0ecbcdd923d0e3b8d4da3992cea395792c6caa16b WHIRLPOOL 7a5fb7e8ea89b64dc1c04e98bc42cc8d3d6cb62c8b9ae22a449c128e2db1cc7549cf0429ce384586eaf00f1d7b6195b9fdca2c8d447c027debad475b2a786cda
+AUX python-gflags-2.0-scripts-install.patch 976 SHA256 1cc7dc3e37762984c299bc1f246a8b6d33236c27fda53813a32bcc35df63c737 SHA512 2ff6f492b327f981ac9125002dc42af277e27f8cde790ba998edb46e40d4168ce2ee142125a5d1d8478951ecb1fdc8b0200db249dcda83f1708acf273d116008 WHIRLPOOL ca5137326b2ec86f0f4011c69b43e1cee73365a1652aebc07d766f53e15f470561e88c46fd348a2a8e518725ba573c5868e23821ae7f42b7965ca417edb3ded4
+AUX python-gflags-2.0-skip-test-as-root.patch 928 SHA256 685f73302a3856db4a6edec685175f91786dcaa83b80c9c21877be6cc514bf71 SHA512 82b0512605becfca884293e5e49b1ecb47e9e59d7966c9bb8acc0db08d0c1c7a6ad8c746601678a1d6e225814f534e474c2818d19bde1a9937fad695fea48f03 WHIRLPOOL 4071cf7e6344ff3941e4a534eecaf464fa520738417b877b537d4b230710a31d068a7105b801e61c1803fba63148696191ea560ac2290718f6ba0b23b9d07658
+AUX python-gflags-2.0-tests-respect-tmpdir.patch 1847 SHA256 67119fb20261a788d489158ceeba99c101879558081fd7a1070ff85c5df6ae86 SHA512 04dffeb6fff757220962a9c0eff91e7c5087b09aa00e74788569c427a278f4b9b952a4989aedce3c3902b1d697779257f82c3fda3781cfb5cd6c0532e92e5444 WHIRLPOOL 99f782c5697779c9ba97298f550230f299fc83625d31017875d23be68b01a0ca59eafd333a17361f0b95dd4a8f49172d5f2f36b210ae5f5f123a4bed5097f816
 DIST python-gflags-2.0.tar.gz 64929 SHA256 311066217acb8cd8519a4c872cb3fe64f02bcf105802bb761ab0de55c2386cd6 SHA512 28566acffd092f09105f3b9ad3be4ada11f024f940914e6efb103907f3779283c63bdfe13edad83aa470c5e887b49ad8b05031fc1895f3bad9b5d9c368bbfe18 WHIRLPOOL 61054cce9033ef26ee6d6296fc761c840f394de07f068a899b52a5d4212de4e4601f9a203fd8033db576e79369e4d53a0bb04bfca0e50cf828ff94105a2b453a
-EBUILD python-gflags-2.0.ebuild 1263 SHA256 c07d5273911b56b26967f2a5e9ac03d2c240e35aaa23047213f32e9ab99f2275 SHA512 5775119661dce6d98d2192ba995c5c83dea9ab55f30ade12baa174feeb9e5b539afa2e21d9005fb7397886f071cfa1a7c564951bbd2a422fe479cf007c9966db WHIRLPOOL 215b01c4a783fb2c73dfa47e3aff0c6e94a5a2938c6d280377057403893dfbc447e089fd2be3c442ccfc187e317e9b3cbf86744af19933d1e54672b798ef45be
+EBUILD python-gflags-2.0.ebuild 1010 SHA256 0e7c600a706fda7197b8a2225f2b527b528b80583a88567992f6a60a74f18b47 SHA512 fb016875f0332607345f238a881177c336a4370fd993157daef921ebd6a6932ece790816cf2b19888968ceeb4f2555d84fa14c3201bd81ad1a3dcde96805f133 WHIRLPOOL 1f612e111cd297cf566dc1993fce22a433f5d169a7de609db45dea80cdc78ed6f4819d9e11e7a1edb6d4909887fab6ff68c8d72bd136c0e927b444c979bba967
 MISC ChangeLog 2616 SHA256 a58e487d0a30378bc82087172f1cddf0c6fdc88f44393c9471391c52a8094e9c SHA512 38e8b3113c2903caf20920f1eea5d51d8b081b8f213c0d24c3b95312a9d3785e764535d360341801a74c438ae955402aeb2ad9482465ac855bc43a6e45e7cc5f WHIRLPOOL 5bd875007d0843aaabc79192848fb3aa010034929c8be3de6fb53888bfad5eb3ccedf75164eb69846233ff95e7408224788a8c4b3a60c53d0b36de94ef315fd9
 MISC metadata.xml 243 SHA256 d50b13bbe1de5e911a663e8c66936ab0f21f281b228d07e3dbe5669f5e1daa16 SHA512 5bd582044af93dab87ae0c18e223253384e4df14a91b06463aabd5625850181778dc562beb04ad1b350552b84c06a9811b5d794fee908cbe3c889820abb8b6dd WHIRLPOOL 15f6e797876844accd5400645b308927a37cc913d4020fedb5fef787936f415a4a6d9cf93dafb3de5dcc68148f37bc0b3fc50c9e259c36b7301297c97fc373e3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
-
-iQJ8BAEBCABmBQJSKNKiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOZeMP/AlB1ySEYD4rQUt1aMt2S6Zf
-EKVtYoYI+xP5A1FnIAEDMYbGNS0D81+yqq60k4PwT4aYjGWPpqHV20EFzR+TYblA
-PJafDdwjxZc6jBWxKJ/5YFG67jy/+6CxN3p/c6N8FUiIR8lulINHGmBvgo6I2UGM
-uHWxbFhHO/+AudwClxH+vsffQYFxLxKoJ5mysu+qmwGgE8SElIYHAzjoTpORepsd
-qLODX+8Q+betJ6VNwD21b7uJD5f4mDYvFpRbqg1jx0inccaGqXl2JiKHiXVzOdPf
-uvsQXuL1Awp7q5/P23ces1qGeFixFsHlruv+BhUx7JrT/rsylfPgyHt1Irilq3O7
-kt4rqANujg7DucxGRfcMUTCATNW+SCeuuSk7pOpC8ro4d59P5NW0j76JUvzPGAyL
-4bAnjFfKXowmdGuILFrOgvOHTRetmSWkOnWVGIA+2YqIcKoQnbBM7q3JRe9lCwBe
-elReWqxyV5iREDonVWNWkXbl+8dicS6jQzN0e+wTOeZfgamobaV/hpzJsHppdFmb
-Igi2pk5xn2dsxL9c675LWZZ7GL+EXIPgBvVwaAmy0MFwjrn60S3ne3cI3mwOI9uI
-MZyGfOqt5FyHbhVFZ2IQ7J00T21n0YN8rV9xZ3eZp53zWwDAFnva9rWudODA66gs
-VA6SZbW79exwQgLHmj3p
-=goLN
------END PGP SIGNATURE-----
diff --git a/dev-python/python-gflags/files/python-gflags-2.0-scripts-install.patch b/dev-python/python-gflags/files/python-gflags-2.0-scripts-install.patch
index 357121c61aab..e29ef951da57 100644
--- a/dev-python/python-gflags/files/python-gflags-2.0-scripts-install.patch
+++ b/dev-python/python-gflags/files/python-gflags-2.0-scripts-install.patch
@@ -1,3 +1,6 @@
+The scripts are installed as 'data' rather than scripts.
+http://code.google.com/p/python-gflags/issues/detail?id=12
+
 From d544cdad63faa5a53ba524e39f091f4a18e1eeb8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Sun, 16 Dec 2012 16:27:13 +0100
diff --git a/dev-python/python-gflags/files/python-gflags-2.0-skip-test-as-root.patch b/dev-python/python-gflags/files/python-gflags-2.0-skip-test-as-root.patch
index 85055341354a..5eb2aa35b267 100644
--- a/dev-python/python-gflags/files/python-gflags-2.0-skip-test-as-root.patch
+++ b/dev-python/python-gflags/files/python-gflags-2.0-skip-test-as-root.patch
@@ -1,3 +1,5 @@
+http://bugs.gentoo.org/475134
+
 From 6e93aa28e1e116619a82e1b78ffbc15ce1133d51 Mon Sep 17 00:00:00 2001
 From: Michael Marineau <mike@marineau.org>
 Date: Thu, 27 Jun 2013 19:26:23 -0400
diff --git a/dev-python/python-gflags/files/python-gflags-2.0-tests-respect-tmpdir.patch b/dev-python/python-gflags/files/python-gflags-2.0-tests-respect-tmpdir.patch
index 035b6b6be404..b3ae14e6dd67 100644
--- a/dev-python/python-gflags/files/python-gflags-2.0-tests-respect-tmpdir.patch
+++ b/dev-python/python-gflags/files/python-gflags-2.0-tests-respect-tmpdir.patch
@@ -1,3 +1,6 @@
+Tests try to write to /tmp (sandbox).
+http://code.google.com/p/python-gflags/issues/detail?id=13
+
 From 4a430830e75bfe2228e9d953b12f74a20ec2cb8f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
 Date: Sun, 16 Dec 2012 16:53:24 +0100
diff --git a/dev-python/python-gflags/python-gflags-2.0.ebuild b/dev-python/python-gflags/python-gflags-2.0.ebuild
index 013d5a3cd305..0e4291c8b4d5 100644
--- a/dev-python/python-gflags/python-gflags-2.0.ebuild
+++ b/dev-python/python-gflags/python-gflags-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gflags/python-gflags-2.0.ebuild,v 1.8 2013/09/05 18:47:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gflags/python-gflags-2.0.ebuild,v 1.9 2014/02/03 15:19:57 vapier Exp $
 
 EAPI="5"
 
@@ -21,16 +21,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
 PATCHES=(
-	# The scripts are installed as 'data' rather than scripts.
-	# http://code.google.com/p/python-gflags/issues/detail?id=12
 	"${FILESDIR}"/${P}-scripts-install.patch
-
-	# Tests try to write to /tmp (sandbox).
-	# http://code.google.com/p/python-gflags/issues/detail?id=13
 	"${FILESDIR}"/${P}-tests-respect-tmpdir.patch
-
-	# Skip test as root; Bug #475134
-	"${FILESDIR}"/${P}-skip-test-as-root.patch
+	"${FILESDIR}"/${P}-skip-test-as-root.patch #475134
 )
 
 python_test() {