Remove invalid epatch line that snuck its way back in.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 847ce06aed48307413cf8b03b99c65d0fac2fc65..85184d0c12725049eb8feae5d4e774ea9a8be7e7 100644 (file)
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.336 2015/05/06 12:45:37 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.337 2015/05/08 10:09:25 titanofold Exp $
+
+  06 May 2015; Aaron W. Swenson <titanofold@gentoo.org>
+  fluxbox-1.3.7-r1.ebuild:
+  Remove invalid epatch line that snuck its way back in.
 
   06 May 2015; Aaron W. Swenson <titanofold@gentoo.org> fluxbox-9999.ebuild:
   Fix bug 509014.

diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 9c7db58fa4e91b4311ae71ace6135833674982c0..5da36052aee674ddff245e25500c076b882b7623 100644 (file)
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -17,15 +17,15 @@ EBUILD fluxbox-1.3.2.ebuild 3074 SHA256 2b40e87e859143f3ee4624b43dceb3aa2a6d7ef9
 EBUILD fluxbox-1.3.5-r1.ebuild 3285 SHA256 49ed36a34815ffe1fd1c72a82244f815ac0235fb1d830ecae54b296c97591f3f SHA512 ddef282d83461bf7c7bdb0b14adf06ed2395986e735e73a03338e71fe39e228aac1b7a2f928cb62fb8eedc76189e306f0ea71e7ec5cd2de0d09af4b93efda4e5 WHIRLPOOL 280f2a7c7926939dbb820a8e18c3904af1381959cd068c5799d90830439f1dd3413518f0af59dbdafa6891bfa1d1140b585d7a3fe27107842bbdabb2d07a9b23
 EBUILD fluxbox-1.3.5.ebuild 3075 SHA256 1bca49230ae8f60ecc51ff604b5e956a2d28024c42553b3d21795ed1809434fb SHA512 89a9b77b15b6716527baf0e05aa6c32d9b2be0b389718e4bc31fb3c9bbb12c0465a79748f2bbc1410a561ca8272bdbfd7a3dfe35b3f961353a281ba086b3276b WHIRLPOOL 168783ce9d96d0c079d76b5324629039e620429b9ee37a8c9667074efa82db9159f6818933a604609477d54586655c53218d5a3ccf315ddbd442021ceef49214
 EBUILD fluxbox-1.3.6-r1.ebuild 3277 SHA256 5f7276d3294c94850c2351461476a9f22aca811367986cb81c2f06b8e8b93235 SHA512 38dde0ae7172bef2f0bce48756fa35c77b91440875b4d22e50ef6bb8706b3f5f8786d87ed2f06cbbd65a6a0f3c261ad2c2abee7db8203d8b6ffbeb5aec0841c5 WHIRLPOOL d33de9c48979151716013dab18fb42792131e1d63baf447cf891254b7ad863291d1550933b96bf507d5d70af6f6ca6a12ede945d9acc41455ca242a1dccff149
-EBUILD fluxbox-1.3.7-r1.ebuild 3310 SHA256 09cf6cef708d78fbf6f1f012664f6156045954262b589c91492abbc015b90962 SHA512 03a9dec186503441fcdc777cb394af57a4e3dbea2b92f18511b21a79e7b38af38a951d690e4a9049b0951fbdc914012001f7aeda0f41e4561d203488cef5e765 WHIRLPOOL a0473867d75fc68349f6faac8a3fbe7fd5e0570e299ee80c5fab6311048b5a582d73b3b091d582eb53acdc21e07d1e9bd6e8f7d32fd0bc465a433e9a0cb15cdf
+EBUILD fluxbox-1.3.7-r1.ebuild 3198 SHA256 52d98ce2cae970776446e65e18e134413acde1e5afd5c765294cc833882889f1 SHA512 df2ce64e69ea87ffac57cea887436a1c32a50b2d3e3383ab854f7c0ebdad712bc90a9b84a19930c9cf08596a1ff940e4ef2755a3c293c6239a02abf384b7989f WHIRLPOOL 1a3a47716e3ba137766171f2990a49a63f2130f6ad2c76dfee532b2d451550be064b76a08d6fb55be7f34c0d53fbe4d70c16592c0d38561d68d9ce8868c84213
 EBUILD fluxbox-1.3.7.ebuild 3135 SHA256 838dcc5532f343cabc0ff57fa26efb410856f518cd728472f1c543c8a5e4c9f0 SHA512 f75ffc1a4f3274be805fb51530aa250f6419a4dd0130233e893625baee89276465ed87e426b3f9e9bee652d8b00cb667466f0d8229b7af88893877e5500ca3f2 WHIRLPOOL 061615df89ed40f1b3d53ed778f9f1787e66405d735b4919ed07e4cd0b353cc2e59dc30672839c48f91340a6d0d6c2b1f954b486d9f575b0c5a62a806d1f1903
 EBUILD fluxbox-9999.ebuild 3117 SHA256 15c38b1bdf3725f805d4eaf1b331b21816fc30dc99e48e337f822286a7f55e60 SHA512 b7658e91356d5d71f0c4829f27d35f6dd892467398e3e1574d8884f8cbc4e528136eff96493351cbb3553dc73a356b1d542ba0c6781d7d6af66b217206177a31 WHIRLPOOL 1d0ed8e5e1d3e223c72e69035af94a3ba101e1c06216cc6223c91eb9ef6b563c190296360e5c83c28f22bfc20091ba7d3dcbd2920d7378054fcf40654cf9ea2b
-MISC ChangeLog 60240 SHA256 3f9a2ee98f6ac08654ada80c15a9709b764cf3ccca4f09bcc461cca7be937134 SHA512 944e68f839759b258d95ad79e8268fd9a0b78f052b13d230dbd7b9f831716823b86d4542df62740b7358c28aa79e9d3ed071d09a2ed62c7594c2bd3f92bb14e5 WHIRLPOOL b771e814c3bbd5a9a2b145ef428cf99dc86c097c6d4e40b0fb7c877f402ca992ec2927a984dd637740d60e6e646a2368d17df1740000a0debb1836c69fa8b481
+MISC ChangeLog 60381 SHA256 3cdd29d45ddf8998b1d2fcd30a730b02a7eff237ccc3eff16ba970d06109d2f4 SHA512 ca7dfa071ea6bc867aa1c37a1d0a4fd644720acfd564f9af2b16fbf93e26fd741d740f7fe93b938a684309aa8934075549553224a1d3fb2e74af7a77e0d4ad00 WHIRLPOOL 7932a38eb508afd0eb60d02b8448007c529633b1e21158ce961ec31f32599c1c5b2cc6fd61676f41a1741294c7c0546c298619b6d581d5040c4125b554dae891
 MISC metadata.xml 1114 SHA256 81d6c8abe509b4bfd67acbe9728aaf7740b5c88899980a55f08a1fe878f9e407 SHA512 a10d0232cf20be4a44701b9c225e0f9240f03a27f9d9f46fc426f19c2b2dfa469f61b60fdc78d1d2f710a7c077b7d89e4b77b3015af0917f31524651566972e4 WHIRLPOOL 64d6164d03e5f642f024e3439ea86c95101f27caa4dd85aa913114663b20c103e1157581f902a60788c61fba5fe59719ef9084bf51b103a2eeeae0016473692e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlVKDPIACgkQVxOqA9G7/aC4/QD/cpg4qeKfkvjw/7NGQaH3+jRJ
-HbYUFLRUTyZBV8zvl+UA/2vTSdkIZsy+wDaII6d6GOSX6SRu7ic2wtd+o+wlB9VA
-=Q8iu
+iF4EAREIAAYFAlVMi1sACgkQVxOqA9G7/aCiMQD/eNdq8n/PmOq8Aj3zKItPIp9g
++gWFuuYuNG5hUsnB3iUA/2ndEtveIBRQZtpRJKU1VzFjZ9KPW+jEmG5Wsf+jZzD4
+=QJc0
 -----END PGP SIGNATURE-----

diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild
index 7f50e10c5df7d315b3153e57189af8c712ead555..6b4fee91dd24aa1f5fec9fd75ee486a79f5261d8 100644 (file)
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-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/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild,v 1.1 2015/05/06 11:05:47 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild,v 1.2 2015/05/08 10:09:25 titanofold Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs prefix
@@ -45,8 +45,6 @@ src_prepare() {
        # files in menu [include] items. This patch will allow us to do clever
        # things with style ebuilds.
        epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
-       # Fix the semantic issue of icon paths, bug #536370
-       epatch "${FILESDIR}"/1.3.5-generate_menu-printf-fix.patch
 
        eprefixify util/fluxbox-generate_menu.in