[www-client/uzbl] makefile patch applied upstream in experimental branch, don't try...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index 8f550afb1f0f1f306d715fe497ceda297987bd6d..2a2ac82489c46cde1f7d4c634850c1ee093d4471 100644 (file)
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.21 2010/03/14 14:37:35 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.22 2010/03/14 14:56:01 wired Exp $
+
+  14 Mar 2010; Alex Alexander <wired@gentoo.org> uzbl-9999.ebuild:
+  makefile patch applied upstream in experimental branch, don't try to patch
+  again
 
 *uzbl-2010.02.02-r1 (14 Mar 2010)
 

diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index f7a88de94664fc86e4db6f4e6b394a6993dbec61..f6dd03967b9edc1af87ead934589dda4675097a6 100644 (file)
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,6 +1,6 @@
 AUX uzbl-makefile-docdir.patch 1167 RMD160 c9e4c7c927e6cef4d35ced2af11c723f4998d7f5 SHA1 71dfd176b83d5459f5c9915cf8651c38dec2c459 SHA256 dc0a1ebc7b08c17e63afe60d3db39cc846ca43a5ad01789c07f1d3198153d43a
 DIST uzbl-2010.02.02.tar.gz 136063 RMD160 6175ad388d9946a2f02c22bec3d7dd05b7f3f87a SHA1 a24565f554cb15e49e990a381e6f3322eaf4c5c6 SHA256 23b1e7b7b0ce40605e838f2af70cabd7f430a4f4b55f0b7e73a89296c40f2a6a
 EBUILD uzbl-2010.02.02-r1.ebuild 2620 RMD160 8526f896df032a4b1199cdad41821d6a023b384c SHA1 f84fcdf88f6708cab71f608d13de7866ce749973 SHA256 171683741e6762efef6f8cc17fb92a82284d18eb3fb858caabfa58f4ec9149a9
-EBUILD uzbl-9999.ebuild 2670 RMD160 3190c763b350d7c436e4e1f939e07ee79015ebc5 SHA1 dac0804f9020f3d42489273bcf3ea902103d8919 SHA256 2f6b6b83a63ee6937d8e1b90c08f42838166e4b3822f7e644b82fef3795dc30b
-MISC ChangeLog 4223 RMD160 63462be3179c54a41c4c3a80cce979a7118c03d3 SHA1 61b8184a5972f596ebd598388840349265df4874 SHA256 0227fd8ae38cf52e0f37747b0d81e5919337c7c670697b31f1d14eedb4a5eb16
+EBUILD uzbl-9999.ebuild 2731 RMD160 a16eca4afdeb50e7cf42d5a22f4684aedf9e05ec SHA1 b579e48a8f60bf2d96609ac94726a8324095b00b SHA256 162084f48b7b65760d8c4bdd987dec6c3eb01156ce7347e4ba2ea23472cea34f
+MISC ChangeLog 4376 RMD160 8c799b6ff55d36e8d3f9a55617a0a91903c95779 SHA1 e6b89b44ce4165103cfe3507944cbbb54e412d62 SHA256 9137aeae6dd9c941019762717f5d6cf49875a094507bc5bebc4ed02ad03dce45
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535

diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index f9deec990bf9dfafbad3aa34082c5b225029fa28..868330340fadad1134cdf5b7d8be3371a4abe0a8 100644 (file)
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.10 2010/03/14 14:37:35 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.11 2010/03/14 14:56:01 wired Exp $
 
 EAPI="2"
 
@@ -84,8 +84,8 @@ pkg_setup() {
 src_prepare() {
        git_src_prepare
 
-       # patch Makefile for DOCDIR
-       epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch
+       # patch Makefile for DOCDIR - already applied in experimental branch
+       use experimental || epatch "${FILESDIR}"/"${PN}"-makefile-docdir.patch
 
        # remove -ggdb
        sed -i "s/-ggdb //g" Makefile ||