New release: 1.7.5

Package-Manager: portage-2.0.51.22-r2

6 files changed, 48 insertions, 67 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index e47120ccc1fc..2683cc1f1ddf 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.30 2005/08/23 21:00:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.31 2005/08/26 07:44:07 leonardop Exp $
+
+*epiphany-1.7.5 (26 Aug 2005)
+
+  26 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +epiphany-1.7.5.ebuild:
+  New version. Added 'python' USE flag. Re-added previous keywords.
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org> epiphany-1.6.3.ebuild:
   stable on ia64
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 2395de3c58cb..4e5af4a7faee 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,21 +1,20 @@
+MD5 fd2cc27a75b938e215309bfbdaf17b8d ChangeLog 16758
+MD5 4a6673e65e0c260a49eeb0bb4cf19404 epiphany-1.6.4.ebuild 1546
 MD5 d89a18b9e1f3c752a5ea444c4ccfc52f epiphany-1.6.3.ebuild 1387
+MD5 79354a721dacc0b0c07027a8d6c6a636 epiphany-1.7.5.ebuild 1823
+MD5 367a39d041ceb2efe66ccac8426e610d epiphany-1.4.8.ebuild 1458
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5ef08e685400da84661b9f037d81a668 epiphany-1.6.0-r3.ebuild 1539
-MD5 f53353d1ab37033a55d360a9f5c467a1 epiphany-1.7.4.ebuild 1625
-MD5 6153035e905534bd00e5798a779731c5 ChangeLog 16576
-MD5 4a6673e65e0c260a49eeb0bb4cf19404 epiphany-1.6.4.ebuild 1546
-MD5 367a39d041ceb2efe66ccac8426e610d epiphany-1.4.8.ebuild 1458
-MD5 c1fc78ef3e0793861e74799bbcb6238c files/epiphany-1.6.0-fix_includes.patch 519
-MD5 53b1d3a0b55b71a1033d6d89d614b800 files/epiphany-1.7.4-configure.patch 1048
-MD5 40c2cd3b20e5f2847e868edbc4f58915 files/epiphany-1.6.0-wallet_fix.patch 598
-MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r3 68
+MD5 f5e29a6e660b776ab387ee60f32007da files/digest-epiphany-1.6.4 68
 MD5 4bdb7ef61d15074ac2213b2f78f61213 files/epiphany-1.7.4-includes.patch 257
+MD5 33e0411373bca2ed61ba6d41f9748ec8 files/digest-epiphany-1.7.5 68
 MD5 24ec843041b5b9fd528431dd8e291297 files/digest-epiphany-1.4.8 68
-MD5 f5e29a6e660b776ab387ee60f32007da files/digest-epiphany-1.6.4 68
-MD5 2a6d9343d321b67fb737cb87301facfc files/epiphany-1.6.0-wallet_password.patch 1307
-MD5 3e5d6d82d44078ec1c95566207f9bad1 files/epiphany-1.6.3-fix_includes.patch 369
-MD5 a25c1442407af78c77c66c2fbd8f521e files/digest-epiphany-1.7.4 68
-MD5 5dd8a008a5612c492c8d0b648f5b0954 files/epiphany-1.4.6-moz-nsiurip.patch 1071
 MD5 124caf61eb374940967a1d4c561270ca files/epiphany-1.4.6-fix_includes.patch 869
-MD5 eb83ab75c0e81a4aff0d93a8d8a4e338 files/digest-epiphany-1.6.3 68
+MD5 5dd8a008a5612c492c8d0b648f5b0954 files/epiphany-1.4.6-moz-nsiurip.patch 1071
+MD5 c1fc78ef3e0793861e74799bbcb6238c files/epiphany-1.6.0-fix_includes.patch 519
 MD5 a9590e1794335ecb9fb376a3b128570b files/epiphany-1.6.0-view_source.patch 11178
+MD5 40c2cd3b20e5f2847e868edbc4f58915 files/epiphany-1.6.0-wallet_fix.patch 598
+MD5 2a6d9343d321b67fb737cb87301facfc files/epiphany-1.6.0-wallet_password.patch 1307
+MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r3 68
+MD5 eb83ab75c0e81a4aff0d93a8d8a4e338 files/digest-epiphany-1.6.3 68
+MD5 3e5d6d82d44078ec1c95566207f9bad1 files/epiphany-1.6.3-fix_includes.patch 369
diff --git a/www-client/epiphany/epiphany-1.7.4.ebuild b/www-client/epiphany/epiphany-1.7.5.ebuild
index 7c5111b93f2d..6f81c18bfaec 100644
--- a/www-client/epiphany/epiphany-1.7.4.ebuild
+++ b/www-client/epiphany/epiphany-1.7.5.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.7.4.ebuild,v 1.3 2005/08/20 22:48:21 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-1.7.5.ebuild,v 1.1 2005/08/26 07:44:07 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -9,58 +9,62 @@ HOMEPAGE="http://www.gnome.org/projects/epiphany/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="dbus debug doc firefox"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="dbus doc firefox python"
 
-RDEPEND=">=dev-libs/glib-2.8
+RDEPEND=">=dev-libs/glib-2.7
 	>=x11-libs/pango-1.8
-	>=x11-libs/gtk+-2.6
+	>=x11-libs/gtk+-2.6.3
 	>=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.7
 	>=gnome-base/libglade-2.3.1
 	>=gnome-base/gnome-vfs-2.9.2
-	>=gnome-base/libgnomeui-2.6.0
+	>=gnome-base/libgnomeui-2.6
 	>=gnome-base/gnome-desktop-2.9.91
 	>=x11-libs/startup-notification-0.5
-	>=gnome-base/libbonobo-2.2
+	>=gnome-base/libgnomeprint-2.4
+	>=gnome-base/libgnomeprintui-2.4
+	>=gnome-base/libbonobo-2
 	>=gnome-base/orbit-2
 	>=gnome-base/gconf-2
 	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/iso-codes-0.47
+	>=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 )
+	python? (
+		>=dev-lang/python-2.3
+		>=dev-python/pygtk-2.7
+		>=dev-python/gnome-python-2.6 )
 	x11-themes/gnome-icon-theme"
+# pygtk dependency needs to be >= 2.7
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
-	dev-util/pkgconfig
+	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.29
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+USE_DESTDIR="1"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
-USE_DESTDIR="1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
 
-	# Fix include paths for our mozilla
-	epatch ${FILESDIR}/${P}-configure.patch
-	epatch ${FILESDIR}/${P}-includes.patch
-}
-
-src_compile() {
-	G2CONF="${G2CONF} $(use_enable dbus) --disable-scrollkeeper"
+pkg_setup() {
+	G2CONF="$(use_enable dbus) $(use_enable python) --disable-scrollkeeper"
 
 	if use firefox; then
 		G2CONF="${G2CONF} --with-mozilla=firefox"
 	else
 		G2CONF="${G2CONF} --with-mozilla=mozilla"
 	fi
+}
 
-	gnome2_src_compile
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Fix include paths for our mozilla
+	epatch ${FILESDIR}/${PN}-1.7.4-includes.patch
 }
diff --git a/www-client/epiphany/files/digest-epiphany-1.7.4 b/www-client/epiphany/files/digest-epiphany-1.7.4
deleted file mode 100644
index f170b8279b3b..000000000000
--- a/www-client/epiphany/files/digest-epiphany-1.7.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8c500e47b377badeb91c5daf913aa9b9 epiphany-1.7.4.tar.bz2 3369525
diff --git a/www-client/epiphany/files/digest-epiphany-1.7.5 b/www-client/epiphany/files/digest-epiphany-1.7.5
new file mode 100644
index 000000000000..c3d6da0fa2b1
--- /dev/null
+++ b/www-client/epiphany/files/digest-epiphany-1.7.5
@@ -0,0 +1 @@
+MD5 d27b716603b9c36be91430c366077423 epiphany-1.7.5.tar.bz2 3345022
diff --git a/www-client/epiphany/files/epiphany-1.7.4-configure.patch b/www-client/epiphany/files/epiphany-1.7.4-configure.patch
deleted file mode 100644
index ad076a049dc6..000000000000
--- a/www-client/epiphany/files/epiphany-1.7.4-configure.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: configure.ac
-===================================================================
-RCS file: /cvs/gnome/epiphany/configure.ac,v
-retrieving revision 1.102
-diff -u -u -8 -p -r1.102 configure.ac
---- configure.ac	8 Aug 2005 20:38:37 -0000	1.102
-+++ configure.ac	9 Aug 2005 19:25:22 -0000
-@@ -262,16 +262,19 @@ dnl **********************************
- dnl now tests for mozilla API variance
- dnl **********************************
- 
- dnl FIXME find a m4/autoconf guru who can distill this into a nice macro
- 
- CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/pipnss `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom`"
- CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $MOZILLA-xpcom`"
- 
-+dnl gentoo headers are special :(
-+CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/dom"
-+
- AC_MSG_CHECKING([[whether we have a gtk 2 mozilla build]])
- 
- AC_RUN_IFELSE(
- 	[AC_LANG_SOURCE(
- 		[[#include <mozilla-config.h>
- 		  #include <string.h>
-                   int main(void) {
- 		    return strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") != 0;
-