summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-04-21 13:30:24 +0000
committerJeroen Roovers <jer@gentoo.org>2010-04-21 13:30:24 +0000
commit3a1b6363d6f416b7653eb39b1c8e53da51dffa03 (patch)
tree16e2e4cc02bc8efde7617af9de8fa69d916b3f1f
parentVersion bump <http://my.opera.com/desktopteam/blog/2010/04/21/new-rc-for-wind... (diff)
downloadhistorical-3a1b6363d6f416b7653eb39b1c8e53da51dffa03.tar.gz
historical-3a1b6363d6f416b7653eb39b1c8e53da51dffa03.tar.bz2
historical-3a1b6363d6f416b7653eb39b1c8e53da51dffa03.zip
Block media-gfx/surf (bug #316511).
Package-Manager: portage-2.2_rc67/cvs/Linux i686
-rw-r--r--www-client/surf/ChangeLog5
-rw-r--r--www-client/surf/Manifest4
-rw-r--r--www-client/surf/surf-0.3-r1.ebuild7
3 files changed, 11 insertions, 5 deletions
diff --git a/www-client/surf/ChangeLog b/www-client/surf/ChangeLog
index e964f2cdeb3d..9ddd988a0fb1 100644
--- a/www-client/surf/ChangeLog
+++ b/www-client/surf/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-client/surf
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.4 2010/02/20 18:21:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/ChangeLog,v 1.5 2010/04/21 13:30:24 jer Exp $
+
+ 21 Apr 2010; Jeroen Roovers <jer@gentoo.org> surf-0.3-r1.ebuild:
+ Block media-gfx/surf (bug #316511).
*surf-0.3-r1 (20 Feb 2010)
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index 3d68aa3e6dc2..c1fb8f8b152b 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,5 +1,5 @@
AUX surf-0.3-download.patch 684 RMD160 8c63cc66503a10eb65683e83ff25656e0c54fb90 SHA1 7306e5e92077e1e41bb377ec57a38b0db86b558d SHA256 5e427422a13c4442dbd0eb56f1811e04ab7cd86b1aae24d2185762f4ea4b4386
DIST surf-0.3.tar.gz 9838 RMD160 d22378f6bb12124071e581f24f91ff731b86923f SHA1 c201a48e0b0e2de573b73e286ca4feda4f6df9a8 SHA256 652a9ddb0a82a6350fabbc7c8d8a9f852b8c838263f892ac7695dfcdd5b31842
-EBUILD surf-0.3-r1.ebuild 1074 RMD160 220670050b9bd4d583d131ece8d7fc332798e26a SHA1 4cf5ea2788ba7e25c8e8bafd74dae181ebdb27a0 SHA256 1a6da1ebc97aca752cbc1d5f600d5e7caf8b44e220d1768d3d7194fc662258e9
-MISC ChangeLog 776 RMD160 ff591622d5c01e885425c3d952005f85c4639515 SHA1 7a2a4d42f2dcc61587952f0f5f581e433c6148f7 SHA256 67635394a6de1201b0f8c3fc8a44ea84f675d1336def0d847dbd50fb084127c4
+EBUILD surf-0.3-r1.ebuild 1094 RMD160 e2b52885649796695b08b54a25f4b3cf797563c6 SHA1 a1228314a352d90e36acaaeb60183d0f3df676b0 SHA256 8ba156e5c2e45253a0040b1c6e6c697d97e4a759b06950b5a4658ad82361745c
+MISC ChangeLog 882 RMD160 b7652b1342048debc8577017fdb81218970f0988 SHA1 d0403493aa94107735ec07250d556da1d38d7378 SHA256 b4b4fb364c4074d057d022efb8125000ad3f30a5e95d8e66a44a4d6d810ef12c
MISC metadata.xml 252 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 SHA1 ddd00321e20f4a53a140eeb56cb01b9fab24d657 SHA256 76fd24f00e95b2892ca60acdce02d8c85dfeff84fc89ca14ffdbc00b82de44b3
diff --git a/www-client/surf/surf-0.3-r1.ebuild b/www-client/surf/surf-0.3-r1.ebuild
index 3f79e504c477..39e8077ab9fe 100644
--- a/www-client/surf/surf-0.3-r1.ebuild
+++ b/www-client/surf/surf-0.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.3-r1.ebuild,v 1.1 2010/02/20 18:21:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-0.3-r1.ebuild,v 1.2 2010/04/21 13:30:24 jer Exp $
EAPI="2"
@@ -16,7 +16,10 @@ KEYWORDS="~x86"
IUSE=""
DEPEND=">=net-libs/webkit-gtk-1.1.14"
-RDEPEND="${DEPEND}"
+RDEPEND="
+ !media-gfx/surf
+ ${DEPEND}
+"
src_prepare() {
epatch "${FILESDIR}"/${P}-download.patch