Patch applied upstream

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

diff --git a/x11-misc/obconf/ChangeLog b/x11-misc/obconf/ChangeLog
index b8616708bd9eb4028b1914b43a3d925af1b7cacc..99f280bea29b420b0dc790572f10b0a4c5d6692a 100644 (file)
--- a/x11-misc/obconf/ChangeLog
+++ b/x11-misc/obconf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/obconf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.83 2011/08/05 15:53:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.84 2011/08/05 16:07:07 hwoarang Exp $
+
+  05 Aug 2011; Markos Chandras <hwoarang@gentoo.org> obconf-9999.ebuild:
+  Patch applied upstream
 
   05 Aug 2011; Markos Chandras <hwoarang@gentoo.org> obconf-9999.ebuild:
   Sync with 2.0.3_p* ebuilds

diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index fdd71800f6aa2710baa3eae5feeea186b1381dd2..65d5219e3f9e072bfeaf680d7f3ef03279a7d9f7 100644 (file)
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -10,23 +10,23 @@ EBUILD obconf-2.0.3-r1.ebuild 1089 RMD160 58089fb59e9f43ffdfed03e9561fbdc3199b0d
 EBUILD obconf-2.0.3.ebuild 977 RMD160 6b7a799895e02bf9c6d0f10e173ae55dce04ca81 SHA1 3943919d44115750c41c7a240c15ec33ee24e6f8 SHA256 0177cfd32b50145bc9e237b79ad35f52e3b3f10936fe83de56b5987e3251468d
 EBUILD obconf-2.0.3_p20110314-r1.ebuild 1527 RMD160 65c0b84a25c3050ce3a6c601ec6f2b54331ac8da SHA1 31226cada53574bf80889cb6a5585682842502bf SHA256 e64a073269e5180068293726a110296537e6f3aa1e3b576e4fe51be92fd62cb8
 EBUILD obconf-2.0.3_p20110314.ebuild 1411 RMD160 c6cbe935f79c12f59df372471cd00db06758bddb SHA1 c62998d78f02b863e33fb87984a55cc398b7ccf3 SHA256 d0fc33dce09aad994325ffa4512e49b8bfb72709bd1298e0487e7aec0c27fddc
-EBUILD obconf-9999.ebuild 1305 RMD160 60c2f2a0c891712fbc11979021a87f2d961af750 SHA1 a410edc9e16a0274c537a07a3402e48b6e149943 SHA256 4b03327d011d701ad1885b76be297b2231c15762566dd030edb33601f6fd4d5d
-MISC ChangeLog 9760 RMD160 549451a1b251bffb79c1d43f4890f78dbb3aad40 SHA1 9cee561729b0d99e0afc7f105b19683b103ed07a SHA256 da0d8286a31ac902e6a1975c3762de4bbf4d81b0bbb58c3ff57c04bf56ece164
+EBUILD obconf-9999.ebuild 1243 RMD160 1982c81a8e1038f9161d343247f6cfc4b0247bac SHA1 7d7f6a19bdbc3eee328776f865eed79ba882da7b SHA256 73a7eb865f86190d319619d14f3d97356e319a3a76c5822aa59870138ae10c7d
+MISC ChangeLog 9859 RMD160 1bdcf81b09a16eaa4a8fa50b424cce3e8e0040d0 SHA1 f081f0ac63aab293bb143a9f0e52645ebfa634c7 SHA256 8ee1813dca704699d1e9ed487e7f98dc2a8f7a4fa48e8fc063454922d9132914
 MISC metadata.xml 335 RMD160 c600d971bc8675522056f2fff821aa27afa95eb1 SHA1 20afa74ae52c0de2dbbb4a78884f84c1823ca868 SHA256 64e1c6ac1bd8e9fdc57724e9286a51bd5e9b3e8aa8f1abb1c08e4f7dc8f4e69a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOPBH8AAoJEPqDWhW0r/LCZcMP/3DgEByRFT8S+b05L8fvJUEJ
-Bhu4UYE6L9bVtZbBJLwUozZtMUwjGgl6tLyL5yrQBA80mTNPc1Fub3GwOOG310ag
-2jIWlm6HwZd1gHcIewzmatCWNS1IVx+MsWX3SVUDI+q+eB+KgOD5a5vnI2l3vFME
-beOGeJSTqbw2dOO2iJkvu7ihhaCIbgApuTt6MofINyC3FmBAS2HuqhPz7UV7U5B2
-J58YK9Vs2RJWPXy2PV+V21DaZfF8bn4/mbXFJ5wk39uJTe/d6ECnkKn70/EdEd/p
-aFScTdBCSDBdWsX/d3hdvG404kN90CV2uvy93j2VkMD4Ca4eacSANNPby1CW/6WS
-McVTkL1QmTZkXaHHtk76QiEIXWbiNpDQ+P3zlnLb3H8JhL+PfsQrmbbA8c1ETcMg
-jZPzq3Kfa7ctUXySXm/m3ZVDab03OcJOVmuExCJquV+y1UmowaZXWvtkugBDHdut
-AFJyg9K5lt+0ousMSxSknxEAkWDP+LvJscKy2HCQpYhWE3baLHD6TiPkvRXtSA1x
-qDZjymf7AOp+cEfcTPYu4j5m/r263kXh2PsIwle/Bmx+qHB6HRFlnftbbwLXoemY
-qWZPLrmpeCfJ4245zwgmlUsseLWT50aNYkF9Gkgxa/6UBrQG0PTUYPzV+QQ7LykX
-cXejhCVfuzwcEUZZWj5b
-=/eFh
+iQIcBAEBCgAGBQJOPBUZAAoJEPqDWhW0r/LCzUYQAIBbPmwf/pgZtQYqGRyfCmYl
+CVMc4IZz3Dc6H1YXXgWmBOYzBq+Rp3ZE9YJ02FeoIyfogXQivVYdN5+clrAGZoue
+J279PPE54eirDrXWs+9pFdbwwUgVynL7G+liMEgrg3sgCZop3JXV0oe14ec+SBmP
+AAzPHznSdbsk4M9a04SQOEPjConaI8iRJ2Bv7kI/eqnlFe1T+Fh6Sk4pKcGdu9OF
+3I6YDiPM35spiBmg8w2Dff3Y8bYRM3lYAhW6Wf1ApYS77flwBqZNIiLUWANL7H0e
+sYfSO6T48/2jLdNmLWoO2MG0777yZkySHIUuBlOSFdwsQDAOgEF3xG7caKVjnrb8
+dTHZ+rgoTKgx+2H1SgtR1QbYh2aaCON8Vr+R3JzzM7kyGfmD8QmaW+2sCh6xt2JD
+iwQHRE8K2vc2cKOc8KuIU6v9LaJVrun9qtM8qHVpvtHcBO6wIidqAGW4OLzZSSiK
+yxv84f5fSgck75sQyvuyvAf5KJlsy5o2io4R0uuSXbQ1RdT9ScnskfTInSe3K5kU
+/ZBv/GVFtR9LM4+jng7Tfx0co8YHgbea8tw2J9y1CslfJ7Lqm82wBrFqmW8igJqG
+bSxXgti71Am9FOJ6lVBXmT6ygx0A7p4pdwNbDnl682B3DTKn7t6w+e31uJHH6YAF
+sIU+qBkk5AtW2smqLc9O
+=SNn0
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/obconf/obconf-9999.ebuild b/x11-misc/obconf/obconf-9999.ebuild
index cc0c6fba930884166f03fd765dbe2c96d4f95704..23d4b76fb0590debc0fcda9436c29e9620f2c2a5 100644 (file)
--- a/x11-misc/obconf/obconf-9999.ebuild
+++ b/x11-misc/obconf/obconf-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-9999.ebuild,v 1.8 2011/08/05 15:53:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-9999.ebuild,v 1.9 2011/08/05 16:07:07 hwoarang Exp $
 
 EAPI="2"
 
@@ -28,7 +28,6 @@ src_prepare() {
        if use lxde; then
                sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${PN}.desktop || die
        fi
-       epatch "${FILESDIR}"/${PN}-2.0.3_p20110314-config-path.patch
        eautopoint
        eautoreconf
 }