diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2009-03-29 00:36:59 +0100 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2009-03-29 00:36:59 +0100 |
| commit | 22b6eb27ce51a8b063d4fd0f2e59325f1ff2f835 (patch) | |
| tree | b3ebc5ef57b7f02f977baf2a592046168156dfd6 /www-client | |
| parent | Add comment for pango-1.24 p.mask (diff) | |
| download | gnome-22b6eb27ce51a8b063d4fd0f2e59325f1ff2f835.tar.gz gnome-22b6eb27ce51a8b063d4fd0f2e59325f1ff2f835.tar.bz2 gnome-22b6eb27ce51a8b063d4fd0f2e59325f1ff2f835.zip | |
www-client/epiphany: add patch from bug #263990.
* Move to EAPI=2
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/epiphany/Manifest | 3 | ||||
| -rw-r--r-- | www-client/epiphany/epiphany-2.26.0.ebuild | 22 |
2 files changed, 14 insertions, 11 deletions
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index 790294da..316a3abb 100644 --- a/www-client/epiphany/Manifest +++ b/www-client/epiphany/Manifest @@ -1,4 +1,5 @@ +AUX epiphany-2.26.0-xulrunner191.patch 491 RMD160 ae36fd6f67b9afb3c03413bed685f10816ac24d2 SHA1 b5ba78085dcf35677361af9008f3f8998788ddd8 SHA256 3c8804a9004ed27f4f2ad99f4e434d6d4050711d000ce73ce2c0fc8bc0d197df DIST epiphany-2.26.0.tar.bz2 5626038 RMD160 1bf800f9d178aa1603358caeffb26c32510c1e61 SHA1 c29e0f1c6a560e15e21cbd7f3bee23c57905796b SHA256 e0d801b967c94828c8389e36588be1db9a077830019169f6f9730708ae1d59e5 DIST epiphany-2.27.1.tar.bz2 5677062 RMD160 f8c4830316ced61855742e7a20dae227f56748cd SHA1 371de50c84bc69697e51cc83f03a5fc026869baa SHA256 36d2b3652b5bbf7b459fda95ac0f25c429aa2e05e42fede3e88ce463879bdb8b -EBUILD epiphany-2.26.0.ebuild 2407 RMD160 e0244649951e31b571a096c5ed125934a4d1325e SHA1 30002b16f1a572d46b1ed1fddaccdfdae9580a50 SHA256 ae63f3c08b1e29ce1b2cf991732a625959d6c93b44e4007bf324e138cf4f4a40 +EBUILD epiphany-2.26.0.ebuild 2380 RMD160 17c5bf67e83e09e39b9113aee74b209c8e6cd8df SHA1 846182bea81040f70d7d6a5d1a6b04b7700e7a40 SHA256 03f818ac011a3fb473b02f7ffef02f49c23a06f0293508a14e5dd56bfaf1d32d EBUILD epiphany-2.27.1.ebuild 1449 RMD160 6aab1a029b5e4678c49bccc6f089afa961577a81 SHA1 8cc3dd1de6ecc0d03b2de89aaf3abf456732d379 SHA256 3715d1800c28fa613f4dbd5290ad01cea1394adebb7b757efbe86dd09bfa8e7a diff --git a/www-client/epiphany/epiphany-2.26.0.ebuild b/www-client/epiphany/epiphany-2.26.0.ebuild index 56360e31..0e6b0533 100644 --- a/www-client/epiphany/epiphany-2.26.0.ebuild +++ b/www-client/epiphany/epiphany-2.26.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.24.3-r10.ebuild,v 1.6 2009/03/15 22:24:03 maekke Exp $ -EAPI="1" +EAPI="2" inherit gnome2 eutils multilib @@ -14,6 +14,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 -sparc x86" IUSE="avahi doc networkmanager python spell" +# FIXME: libcanberra is automagic RDEPEND=">=dev-libs/glib-2.18.0 >=x11-libs/gtk+-2.15.1 >=dev-libs/libxml2-2.6.12 @@ -24,7 +25,7 @@ RDEPEND=">=dev-libs/glib-2.18.0 >=gnome-base/gnome-desktop-2.9.91 >=x11-libs/startup-notification-0.5 >=x11-libs/libnotify-0.4 - >=media-libs/libcanberra-0.3 + >=media-libs/libcanberra-0.3[gtk] >=dev-libs/dbus-glib-0.71 >=gnome-base/gconf-2 >=app-text/iso-codes-0.35 @@ -48,12 +49,6 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO" pkg_setup() { - # FIXME: I'm automagic - if ! built_with_use media-libs/libcanberra gtk; then - eerror "You need to rebuild media-libs/libcanberra with gtk support." - die "Rebuild media-libs/libcanberra with USE='gtk'" - fi - G2CONF="${G2CONF} --disable-scrollkeeper --with-gecko=libxul-embedding @@ -65,7 +60,14 @@ pkg_setup() { $(use_enable python)" } -src_compile() { +src_prepare() { + gnome2_src_prepare + + # Fix compilation with xulrunner 1.9.1, bug #263990 + epatch "${FILESDIR}/${P}-xulrunner191.patch" +} + +src_configure() { addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat addpredict /usr/$(get_libdir)/xulrunner-1.9/components/xpti.dat.tmp addpredict /usr/$(get_libdir)/xulrunner-1.9/components/compreg.dat.tmp @@ -75,5 +77,5 @@ src_compile() { addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp addpredict /usr/$(get_libdir)/mozilla/components/compreg.dat.tmp - gnome2_src_compile + gnome2_src_configure } |