New release: 1.8.2. Removing old ebuilds/patches.

(Portage version: 2.0.53_rc3)

9 files changed, 21 insertions, 128 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 86f68897814b..c15f48dc367d 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.41 2005/09/17 11:09:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.42 2005/10/06 11:49:53 leonardop Exp $
+
+*epiphany-1.8.2 (06 Oct 2005)
+
+  06 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -epiphany-1.8.0.ebuild, +epiphany-1.8.2.ebuild:
+  New version.
 
   14 Sep 2005; Marinus Schraal <foser@gentoo.org> epiphany-1.8.0.ebuild :
   Remove libgnomeprint dep because it caused trouble with portage -D option
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index b5442be0237c..a10678a59ed5 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,17 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 42ed3f90418c26b98d5f3db6c093d1ac .epiphany-1.8.2.ebuild.swp 12288
+MD5 93022a60a326e91e260bd6ce1c33daa5 ChangeLog 17834
 MD5 367a39d041ceb2efe66ccac8426e610d epiphany-1.4.8.ebuild 1458
 MD5 5ef08e685400da84661b9f037d81a668 epiphany-1.6.0-r3.ebuild 1539
 MD5 d89a18b9e1f3c752a5ea444c4ccfc52f epiphany-1.6.3.ebuild 1387
 MD5 4c5adfec221fca880f8114d80bcaf86c epiphany-1.6.4.ebuild 1540
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 afa899fbb80bede70e99a017779361fa epiphany-1.8.0.ebuild 1825
-MD5 93022a60a326e91e260bd6ce1c33daa5 ChangeLog 17834
+MD5 596b74ff7e05d9c18dc96e68b7a969c1 epiphany-1.8.2.ebuild 1795
 MD5 24ec843041b5b9fd528431dd8e291297 files/digest-epiphany-1.4.8 68
 MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r3 68
 MD5 eb83ab75c0e81a4aff0d93a8d8a4e338 files/digest-epiphany-1.6.3 68
 MD5 f5e29a6e660b776ab387ee60f32007da files/digest-epiphany-1.6.4 68
+MD5 4f66f0756bf94bf08a8e0de34314a922 files/digest-epiphany-1.8.0 68
+MD5 5fb4e1fd4c18f309c424c308686d9c43 files/digest-epiphany-1.8.2 68
 MD5 124caf61eb374940967a1d4c561270ca files/epiphany-1.4.6-fix_includes.patch 869
 MD5 5dd8a008a5612c492c8d0b648f5b0954 files/epiphany-1.4.6-moz-nsiurip.patch 1071
 MD5 c1fc78ef3e0793861e74799bbcb6238c files/epiphany-1.6.0-fix_includes.patch 519
@@ -19,11 +19,4 @@ MD5 a9590e1794335ecb9fb376a3b128570b files/epiphany-1.6.0-view_source.patch 1117
 MD5 40c2cd3b20e5f2847e868edbc4f58915 files/epiphany-1.6.0-wallet_fix.patch 598
 MD5 2a6d9343d321b67fb737cb87301facfc files/epiphany-1.6.0-wallet_password.patch 1307
 MD5 3e5d6d82d44078ec1c95566207f9bad1 files/epiphany-1.6.3-fix_includes.patch 369
-MD5 4f66f0756bf94bf08a8e0de34314a922 files/digest-epiphany-1.8.0 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDK/l4Kf2g/qXtneoRAmIDAJ4t60s5xgBpvqGNwSL3T0Ji5TlwvQCcDPWd
-id2ZO72t36DmoR6srNbK+do=
-=N5IR
------END PGP SIGNATURE-----
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/www-client/epiphany/epiphany-1.4.8.ebuild b/www-client/epiphany/epiphany-1.4.8.ebuild
deleted file mode 100644
index f18235742fae..000000000000
--- a/www-client/epiphany/epiphany-1.4.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.4.8.ebuild,v 1.10 2005/05/18 02:05:42 weeve Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.4.1
-	>=x11-libs/pango-1.6
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/gconf-1.2
-	>=dev-libs/libxml2-2.6.6
-	>=gnome-base/libgnomeui-2.6.0
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/orbit-2
-	>=gnome-base/gnome-vfs-2.3.1
-	>=www-client/mozilla-1.7.3"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-
-	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
-	then
-		eerror "you need mozilla-1.7.3+ compiled against gtk+-2"
-		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
-		die "Need Mozilla compiled with gtk+-2.0!"
-	fi
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	# Fix include paths for our mozilla
-	epatch ${FILESDIR}/${PN}-1.4.6-fix_includes.patch
-	# Fix compilation/API breakage with mozilla 1.7.5.
-	# See bug #74972 ,<obz@gentoo.org>
-	epatch ${FILESDIR}/${PN}-1.4.6-moz-nsiurip.patch
-
-}
-
diff --git a/www-client/epiphany/epiphany-1.8.0.ebuild b/www-client/epiphany/epiphany-1.8.2.ebuild
index a3658f1ce0e4..c57d3b21a4af 100644
--- a/www-client/epiphany/epiphany-1.8.0.ebuild
+++ b/www-client/epiphany/epiphany-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.8.0.ebuild,v 1.2 2005/09/14 14:57:43 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.8.2.ebuild,v 1.1 2005/10/06 11:49:53 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -32,15 +32,14 @@ RDEPEND=">=dev-libs/glib-2.8
 	>=gnome-base/orbit-2
 	>=gnome-base/gconf-2
 	>=app-text/iso-codes-0.35
-	!firefox? ( >=www-client/mozilla-1.7.3 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.2-r1 )
-	dbus? ( >=sys-apps/dbus-0.22 )
+	!firefox? ( >=www-client/mozilla-1.7.9 )
+	firefox? ( >=www-client/mozilla-firefox-1.0.5 )
+	dbus? ( >=sys-apps/dbus-0.34 )
 	python? (
 		>=dev-lang/python-2.3
 		>=dev-python/pygtk-2.7.1
 		>=dev-python/gnome-python-2.6 )
 	x11-themes/gnome-icon-theme"
-# pygtk dependency needs to be >= 2.7
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
@@ -56,7 +55,9 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 
 pkg_setup() {
-	G2CONF="$(use_enable dbus) $(use_enable python) --disable-scrollkeeper"
+	G2CONF="--disable-scrollkeeper \
+		$(use_enable dbus) \
+		$(use_enable python)"
 
 	if use firefox; then
 		G2CONF="${G2CONF} --with-mozilla=firefox"
diff --git a/www-client/epiphany/files/digest-epiphany-1.4.8 b/www-client/epiphany/files/digest-epiphany-1.4.8
deleted file mode 100644
index 334a50376efe..000000000000
--- a/www-client/epiphany/files/digest-epiphany-1.4.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb9bdb92c5b4a7a97029e942304a9373 epiphany-1.4.8.tar.bz2 3594408
diff --git a/www-client/epiphany/files/digest-epiphany-1.8.0 b/www-client/epiphany/files/digest-epiphany-1.8.0
deleted file mode 100644
index 31878c965225..000000000000
--- a/www-client/epiphany/files/digest-epiphany-1.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 297ca64ce700e90db596a50d58b68a80 epiphany-1.8.0.tar.bz2 3348813
diff --git a/www-client/epiphany/files/digest-epiphany-1.8.2 b/www-client/epiphany/files/digest-epiphany-1.8.2
new file mode 100644
index 000000000000..011a71f72a41
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.8.2
@@ -0,0 +1 @@
+MD5 0a2e479816a1b2845c758e7a5d84a848 epiphany-1.8.2.tar.bz2 3354620
diff --git a/www-client/epiphany/files/epiphany-1.4.6-fix_includes.patch b/www-client/epiphany/files/epiphany-1.4.6-fix_includes.patch
deleted file mode 100644
index 08f707e024d6..000000000000
--- a/www-client/epiphany/files/epiphany-1.4.6-fix_includes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur epiphany-1.4.6/embed/mozilla/Makefile.in epiphany-1.4.6-patched/embed/mozilla/Makefile.in
---- epiphany-1.4.6/embed/mozilla/Makefile.in	2004-11-29 03:54:32.000000000 +0800
-+++ epiphany-1.4.6-patched/embed/mozilla/Makefile.in	2004-12-06 14:13:54.858691504 +0800
-@@ -296,6 +296,7 @@
- 	-I$(MOZILLA_INCLUDE_ROOT)/docshell \
- 	-I$(MOZILLA_INCLUDE_ROOT)/dom \
- 	-I$(MOZILLA_INCLUDE_ROOT)/exthandler \
-+	-I$(MOZILLA_INCLUDE_ROOT)/find \
- 	-I$(MOZILLA_INCLUDE_ROOT)/gfx \
- 	-I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg \
- 	-I$(MOZILLA_INCLUDE_ROOT)/js -I$(MOZILLA_INCLUDE_ROOT)/history \
-@@ -307,6 +308,7 @@
- 	-I$(MOZILLA_INCLUDE_ROOT)/passwordmgr \
- 	-I$(MOZILLA_INCLUDE_ROOT)/pipboot \
- 	-I$(MOZILLA_INCLUDE_ROOT)/pipnss \
-+	-I$(MOZILLA_INCLUDE_ROOT)/pref \
- 	-I$(MOZILLA_INCLUDE_ROOT)/shistory \
- 	-I$(MOZILLA_INCLUDE_ROOT)/uriloader \
- 	-I$(MOZILLA_INCLUDE_ROOT)/uconv \
diff --git a/www-client/epiphany/files/epiphany-1.4.6-moz-nsiurip.patch b/www-client/epiphany/files/epiphany-1.4.6-moz-nsiurip.patch
deleted file mode 100644
index 04fde3148e42..000000000000
--- a/www-client/epiphany/files/epiphany-1.4.6-moz-nsiurip.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur epiphany-1.4.6/configure epiphany-1.4.6-patched/configure
---- epiphany-1.4.6/configure	2004-11-29 03:54:24.000000000 +0800
-+++ epiphany-1.4.6-patched/configure	2004-12-20 16:15:06.608361048 +0800
-@@ -23030,8 +23030,8 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <nsIURI.h>
--		  #include <nsIGlobalHistory.h>
-+#include <necko/nsIURI.h>
-+#include <docshell/nsIGlobalHistory.h>
- 		  #include <docshell/nsIGlobalHistory2.h>
- 		  #include <history/nsIBrowserHistory.h>
- int
-diff -ur epiphany-1.4.6/configure.in epiphany-1.4.6-patched/configure.in
---- epiphany-1.4.6/configure.in	2004-11-25 05:14:25.000000000 +0800
-+++ epiphany-1.4.6-patched/configure.in	2004-12-20 16:14:43.770832880 +0800
-@@ -259,8 +259,8 @@
- 
- AC_COMPILE_IFELSE(
- 	[AC_LANG_PROGRAM(
--		[[#include <nsIURI.h>
--		  #include <nsIGlobalHistory.h>
-+		[[#include <necko/nsIURI.h>
-+		  #include <docshell/nsIGlobalHistory.h>
- 		  #include <docshell/nsIGlobalHistory2.h>
- 		  #include <history/nsIBrowserHistory.h>]],
- 		[[nsIBrowserHistory* p;