merge from webapp overlay; fix unreachable HOMEPAGE/SRC_URI

(Portage version: 2.1.4.1)

3 files changed, 26 insertions, 36 deletions

diff --git a/www-apps/browser-config/ChangeLog b/www-apps/browser-config/ChangeLog
index 1a0b9a98e790..b1f5609cb977 100644
--- a/www-apps/browser-config/ChangeLog
+++ b/www-apps/browser-config/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/browser-config
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/browser-config/ChangeLog,v 1.5 2007/05/11 21:53:16 bangert Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/browser-config/ChangeLog,v 1.6 2008/02/17 19:04:46 hollow Exp $
+
+  17 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  -browser-config-1.0.ebuild, browser-config-1.1.ebuild:
+  merge from webapp overlay; fix unreachable HOMEPAGE/SRC_URI
+
+  05 Feb 2008; Jakub Moc <jakub@gentoo.org>
+  browser-config-1.1.ebuild:
+  Use elog instead of einfo.
 
   11 May 2007; Thilo Bangert <bangert@gentoo.org> +metadata.xml:
   add metadata.xml
diff --git a/www-apps/browser-config/browser-config-1.0.ebuild b/www-apps/browser-config/browser-config-1.0.ebuild
deleted file mode 100644
index df491d5f3046..000000000000
--- a/www-apps/browser-config/browser-config-1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/browser-config/browser-config-1.0.ebuild,v 1.2 2004/09/03 17:17:20 pvdabeel Exp $
-
-DESCRIPTION="A lightweight modular configurable http url handler/browser launcher"
-HOMEPAGE="http://www.pocketninja.com/"
-SRC_URI="http://www.pocketninja.com/code/browser-config/download/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-DEPEND=""
-
-src_install() {
-	into /usr
-	dobin browser-config
-	dosym /usr/bin/browser-config /usr/bin/runbrowser
-	insinto /usr/share/browser-config
-	doins definitions/*
-}
diff --git a/www-apps/browser-config/browser-config-1.1.ebuild b/www-apps/browser-config/browser-config-1.1.ebuild
index 8812476f7867..c61c1d79ed47 100644
--- a/www-apps/browser-config/browser-config-1.1.ebuild
+++ b/www-apps/browser-config/browser-config-1.1.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/browser-config/browser-config-1.1.ebuild,v 1.2 2004/09/03 17:17:20 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/browser-config/browser-config-1.1.ebuild,v 1.3 2008/02/17 19:04:46 hollow Exp $
 
 DESCRIPTION="A lightweight modular configurable http url handler/browser launcher"
-HOMEPAGE="http://www.pocketninja.com/"
-SRC_URI="http://www.pocketninja.com/code/browser-config/download/${P}.tar.bz2"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
+
 DEPEND=""
+RDEPEND=""
 
 src_install() {
 	into /usr
@@ -20,14 +23,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
-	einfo "Please run browser-config -b <browser> -m <method>"
-	einfo "If run as root, it will be global, if run as a user it will be for"
-	einfo "  that user only."
-	echo
-	einfo "Please see browser-config -h for info on available browsers/methods"
-	echo
-	einfo "You may then tell your applications to use either 'runbrowser' or"
-	einfo "  'browser-config' as a browser."
-	echo
+	elog "Please run browser-config -b <browser> -m <method>"
+	elog "If run as root, it will be global, if run as a user it will be for"
+	elog "that user only."
+	elog
+	elog "Please see browser-config -h for info on available browsers/methods"
+	elog
+	elog "You may then tell your applications to use either 'runbrowser' or"
+	elog "'browser-config' as a browser."
+	elog
 }