some makefile improvements after talking with upstream

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

7 files changed, 39 insertions, 123 deletions

diff --git a/www-client/uzbl/ChangeLog b/www-client/uzbl/ChangeLog
index ea20c8ef61ad..709403e0b4d7 100644
--- a/www-client/uzbl/ChangeLog
+++ b/www-client/uzbl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/uzbl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.8 2009/12/05 16:19:54 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/ChangeLog,v 1.9 2009/12/05 17:37:22 wired Exp $
+
+  05 Dec 2009; Alex Alexander <wired@gentoo.org> -uzbl-0_pre20091130.ebuild,
+  uzbl-0_pre20091130-r1.ebuild, uzbl-9999.ebuild,
+  files/uzbl-9999-makefile-cleanup.patch, files/uzbl-makefile-cleanup.patch:
+  some makefile improvements after talking with upstream
 
 *uzbl-0_pre20091130-r1 (05 Dec 2009)
 
diff --git a/www-client/uzbl/Manifest b/www-client/uzbl/Manifest
index 5707bec2a407..7f5b7e390d62 100644
--- a/www-client/uzbl/Manifest
+++ b/www-client/uzbl/Manifest
@@ -1,8 +1,7 @@
-AUX uzbl-9999-makefile-cleanup.patch 2983 RMD160 1016eeb8bc8e4f9bd270d48c60504a80cb4d1dcb SHA1 1036ad6c9db97c3d40bda37acb8675751488af57 SHA256 6792c5661409de1dbb81771b51dae1ace0731ca2bf866c7bd2731d95832c413b
-AUX uzbl-makefile-cleanup.patch 2875 RMD160 e43443d2186020ba20373f240a4a1b0f3a7e0236 SHA1 510578dc221834652fea61a9c68b37650f05a369 SHA256 b60cc33d7e4d2790a7067cd3a21c69731eb16174297cc94c526389cdbf5f56f5
+AUX uzbl-9999-makefile-cleanup.patch 2368 RMD160 c6155828461a5683b995dc7be2865a45f722a1b8 SHA1 9feba08d60943b046a9e44730b0d57ab592826ca SHA256 634c20a4de532bff66c7b41d23df2b4f1f632896b79e1b318ee5c90acca0f556
+AUX uzbl-makefile-cleanup.patch 2737 RMD160 f507286836df2c37f18f172b6ce01de55036524b SHA1 636d54fb4e776f7b0225b1981b24f963c0abca41 SHA256 48360118ff3b433affda66aee8c3d88d838c7169387373c3a632651d9a1cb268
 DIST uzbl-0_pre20091130.tar.gz 131275 RMD160 f5e38a1be15e25c3fe9e12acb5f0c2c45428daa6 SHA1 8b693deec92c9ead53dce2d4f86282a49214008c SHA256 0b09bb22903da53dd04abe0344696d31b3908540249d5d0fa592c36bac79f3f2
-EBUILD uzbl-0_pre20091130-r1.ebuild 2246 RMD160 5bdf7564e147236703ce8391d04d46b2558a775b SHA1 a979485a0edf1376325f7e14082ee68e339b791b SHA256 a0456e2090d4b2313e7063895a7e2d70edd68a5b1a61d080b47b5b8ff430619f
-EBUILD uzbl-0_pre20091130.ebuild 1441 RMD160 7ead02bb2ea5840249f30e942884db89061bbf8b SHA1 f8de04469964f01fc70a223c08261fa44b335efd SHA256 259d990e966acf2525aaec5c6a244793cc2bea22664548ce15f2979fb18e79db
-EBUILD uzbl-9999.ebuild 2188 RMD160 e028d35c9a2db810f7c440c2a699b86137fc1efc SHA1 c8e663edf03a57dd8d51dd59400493826be850eb SHA256 1d6d0c2202076609f69fc97534847a0fcec4e0c859ea44f01a876eb2cd310cf9
-MISC ChangeLog 1474 RMD160 e3e393023a6a5b6361a22cc5f691f1435665e29d SHA1 0aefda25e7e338568db54b3589ccda892eb2a17f SHA256 5371295b59197924872bf8f8d743bcf42947f9e8661451e1cd819d3ad491607a
+EBUILD uzbl-0_pre20091130-r1.ebuild 2257 RMD160 8f0c14b51c2f90214be8eed560b138aef1d80a15 SHA1 86d08d0b4b09774570fc524040112f6152748b5e SHA256 eed2423704d88cd6590ad42138fdc128099915f42b0ae1b1fe95cadd99fdf1fa
+EBUILD uzbl-9999.ebuild 2199 RMD160 4fb3b7da2f2e426dde7df792a8a64230b9c49388 SHA1 42aa71eb9e488091440939109f6ba3ecb72c7b40 SHA256 d9a15a8d7c794aa4b0ae4d1ffa6005ddede9fcbd7a401cd829e00341317b2cca
+MISC ChangeLog 1736 RMD160 9bcd7ed9c10364d061f71b5e63dd2a792352e8b8 SHA1 3391eedfa865ef4a62e5d892e0a1d6e4bf36d04c SHA256 2d8fd290d4997f8c81331de0053e198aa6dc4ad7cf535f562559253f6061edac
 MISC metadata.xml 507 RMD160 60cd39f105f29bac497abebba3966a7db75c70fd SHA1 a67b72d72f0ef3d186c6622918ec680720db5888 SHA256 b532abb6d9c503c8890d76e371fd902de7de0693c442f01f85efaf10b476a535
diff --git a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
index b9cb61d716f7..78faa68ddfa4 100644
--- a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
+++ b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2009-12-04 15:52:06.100130674 +0200
-+++ Makefile	2009-12-04 15:54:32.143205265 +0200
+--- Makefile.old	2009-12-05 19:22:12.079131232 +0200
++++ Makefile	2009-12-05 19:24:51.863115587 +0200
 @@ -1,7 +1,7 @@
  # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
  
@@ -21,12 +21,9 @@
  
  uzbl-browser: uzbl-core
  
-@@ -86,18 +82,14 @@
+@@ -88,14 +84,10 @@
  
- install: install-uzbl-core install-uzbl-browser install-uzbl-tabbed
- 
--install-uzbl-core: all
-+install-uzbl-core:
+ install-uzbl-core: all
  	install -d $(INSTALLDIR)/bin
 -	install -d $(INSTALLDIR)/share/uzbl/docs
  	install -d $(INSTALLDIR)/share/uzbl/examples
@@ -37,18 +34,6 @@
  	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
 -	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
 -	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
- 
--install-uzbl-browser: all
-+install-uzbl-browser: install-uzbl-core
- 	install -d $(INSTALLDIR)/bin
- 	install -m755 uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
- 	install -m755 examples/data/uzbl/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon
-@@ -106,7 +98,7 @@
- 	sed -i "s#^PREFIX = .*#PREFIX = '$(PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
  	sed -i 's#^set prefix.*=.*#set prefix     = $(PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
  
--install-uzbl-tabbed: all
-+install-uzbl-tabbed: install-uzbl-browser
- 	install -d $(INSTALLDIR)/bin
- 	install -m755 examples/data/uzbl/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
- 
+ install-uzbl-browser: all
diff --git a/www-client/uzbl/files/uzbl-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-makefile-cleanup.patch
index f46cdb0649e0..c1a79a1e814f 100644
--- a/www-client/uzbl/files/uzbl-makefile-cleanup.patch
+++ b/www-client/uzbl/files/uzbl-makefile-cleanup.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2009-12-04 15:52:06.100130674 +0200
-+++ Makefile	2009-12-04 15:54:32.143205265 +0200
+--- Makefile.old	2009-12-05 19:30:56.450131512 +0200
++++ Makefile	2009-12-05 19:31:23.960133887 +0200
 @@ -1,7 +1,7 @@
  # first entries are for gnu make, 2nd for BSD make.  see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html
  
@@ -21,12 +21,9 @@
  
  uzbl-browser: uzbl-core
  
-@@ -86,18 +82,14 @@
+@@ -88,14 +84,11 @@
  
- install: install-uzbl-core install-uzbl-browser install-uzbl-tabbed
- 
--install-uzbl-core: all
-+install-uzbl-core:
+ install-uzbl-core: all
  	install -d $(INSTALLDIR)/bin
 -	install -d $(INSTALLDIR)/share/uzbl/docs
  	install -d $(INSTALLDIR)/share/uzbl/examples
@@ -37,18 +34,15 @@
  	install -m755 uzbl-core    $(INSTALLDIR)/bin/uzbl-core
 -	install -m644 AUTHORS      $(INSTALLDIR)/share/uzbl/docs
 -	install -m644 README       $(INSTALLDIR)/share/uzbl/docs
++	sed -i 's#^set prefix.*=.*#set prefix     = $(PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
  
--install-uzbl-browser: all
-+install-uzbl-browser: install-uzbl-core
+ install-uzbl-browser: all
  	install -d $(INSTALLDIR)/bin
- 	install -m755 uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
- 	install -m755 examples/data/uzbl/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon
-@@ -106,7 +98,7 @@
+@@ -104,7 +97,6 @@
+ 	install -m755 examples/data/uzbl/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
+ 	sed -i 's#^PREFIX=.*#PREFIX=$(PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
  	sed -i "s#^PREFIX = .*#PREFIX = '$(PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager
- 	sed -i 's#^set prefix.*=.*#set prefix     = $(PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
+-	sed -i 's#^set prefix.*=.*#set prefix     = $(PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config
  
--install-uzbl-tabbed: all
-+install-uzbl-tabbed: install-uzbl-browser
+ install-uzbl-tabbed: all
  	install -d $(INSTALLDIR)/bin
- 	install -m755 examples/data/uzbl/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed
- 
diff --git a/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild b/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild
index d6bd84a165c8..14440db0c80c 100644
--- a/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild
+++ b/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild,v 1.1 2009/12/05 16:19:54 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-0_pre20091130-r1.ebuild,v 1.2 2009/12/05 17:37:22 wired Exp $
 
 EAPI="2"
 
@@ -77,13 +77,12 @@ src_compile() {
 }
 
 src_install() {
-	if use tabbed; then
-		emake DESTDIR="${D}" PREFIX="/usr" install || die "Installation failed"
-	else if use browser; then
+	emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-core || die "Installation failed"
+	if use browser || use tabbed; then
 			emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-browser || die "Installation failed"
-		else
-			emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-core || die "Installation failed"
-		fi
+	fi
+	if use tabbed; then
+		emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-tabbed || die "Installation failed"
 	fi
 
 	# Move the docs to /usr/share/doc instead.
diff --git a/www-client/uzbl/uzbl-0_pre20091130.ebuild b/www-client/uzbl/uzbl-0_pre20091130.ebuild
deleted file mode 100644
index f7dcb77f896e..000000000000
--- a/www-client/uzbl/uzbl-0_pre20091130.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-0_pre20091130.ebuild,v 1.2 2009/12/04 11:38:32 wired Exp $
-
-EAPI="2"
-
-inherit base
-
-MY_PV=${PV/*_pre}
-MY_PV=${MY_PV:0:4}.${MY_PV:4:2}.${MY_PV:6}
-
-DESCRIPTION="A keyboard controlled (modal vim-like bindings, or with modifierkeys) browser based on Webkit."
-HOMEPAGE="http://www.uzbl.org"
-SRC_URI="http://github.com/Dieterbe/${PN}/tarball/${MY_PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="helpers"
-
-COMMON_DEPEND="
-	>=net-libs/webkit-gtk-1.1.15
-	>=net-libs/libsoup-2.24
-	>=x11-libs/gtk+-2.14
-	>=dev-libs/icu-4.0.1
-"
-
-DEPEND="
-	>=dev-util/pkgconfig-0.19
-	${COMMON_DEPEND}
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	helpers? (
-		x11-misc/dmenu
-		net-misc/socat
-		x11-misc/xclip
-		gnome-extra/zenity
-	)
-"
-
-src_prepare() {
-	cd "${WORKDIR}"/Dieterbe-uzbl-*
-	S=$(pwd)
-
-	# patch Makefile to make it more sane
-	epatch "${FILESDIR}"/"${PN}"-makefile-cleanup.patch
-
-	# adjust path in default config file to /usr/share
-	sed -i "s:/usr/local/share/uzbl:/usr/share/uzbl:g" \
-		examples/config/uzbl/config ||
-		die "config path sed failed"
-}
-
-src_compile() {
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install || die "Installation failed"
-
-	# Move the docs to /usr/share/doc instead.
-	dodoc AUTHORS README docs/*
-}
diff --git a/www-client/uzbl/uzbl-9999.ebuild b/www-client/uzbl/uzbl-9999.ebuild
index 6bbeb154d382..4834ded6c460 100644
--- a/www-client/uzbl/uzbl-9999.ebuild
+++ b/www-client/uzbl/uzbl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.4 2009/12/05 16:19:54 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/uzbl/uzbl-9999.ebuild,v 1.5 2009/12/05 17:37:22 wired Exp $
 
 EAPI="2"
 
@@ -77,13 +77,12 @@ src_compile() {
 }
 
 src_install() {
-	if use tabbed; then
-		emake DESTDIR="${D}" PREFIX="/usr" install || die "Installation failed"
-	else if use browser; then
+	emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-core || die "Installation failed"
+	if use browser || use tabbed; then
 			emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-browser || die "Installation failed"
-		else
-			emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-core || die "Installation failed"
-		fi
+	fi
+	if use tabbed; then
+		emake DESTDIR="${D}" PREFIX="/usr" install-uzbl-tabbed || die "Installation failed"
 	fi
 
 	# Move the docs to /usr/share/doc instead.