old

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 4 insertions, 114 deletions

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 4c77e11db65c..f18df6f3ccc7 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,10 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX midori-0.2.9-libnotify-0.7.patch 688 RMD160 329d7ada064e2825f6cfafe60fa4e19c003c17d1 SHA1 6c23d8ff63f12891eef0dd7cf1b12ba1de749ccb SHA256 603c99b9f0d745e6e80f87cd6b20438b6f11b081755e2061b2cea41b18f1b6b2
-DIST midori-0.2.9.tar.bz2 802627 RMD160 3b8f2f8fa55f10e80a9e769e4085f96b7fa769ab SHA1 3329c3b9cbe1d2fa0cb94e3f864802fae4fc5e9b SHA256 803bf534ab73cf7a50ddd38bbd68976258c36f335a3f1dc1880f53915c7fdf78
 DIST midori-0.3.3.tar.bz2 848720 RMD160 f2380250f3246a3a7c32edb3eba884d3c8ed946f SHA1 01baf6243f7b00af5e5b4eb6ac5d3233e60bc993 SHA256 236770d134e2eb9c44776e233903fc0afa760cd3b8b87d12316e1b25afe2d3fe
-EBUILD midori-0.2.9-r1.ebuild 2224 RMD160 24fb4e63cfeb639e6d0fa6795bd6160e210dfa99 SHA1 9aceca7fa7a4ff62565ec2d145a6a2fcf169a301 SHA256 2a1616c9d958db0be0ec86ed8ce6690344a98befe2d9d99dab072bf092bfd523
 EBUILD midori-0.3.3.ebuild 1839 RMD160 fd922af7dc90a138bca4541e385c2b13ab078127 SHA1 0bee7c73243741df2df12c4e15d9ae3c191a8064 SHA256 3eb3c3a70a1b18efa0e9036f23429bb109f9c3bed169db32eb32d0e3d81ce642
 EBUILD midori-9999.ebuild 1803 RMD160 dcbec94084b9ec89ad199997df90960753465788 SHA1 3d008f604648b9fcf0171edb25e0743106bdd272 SHA256 c0038aaa8b203d42c6cd14c4e1a629a8eadad72d0c09898c8d99d446fe5ead26
 MISC ChangeLog 9009 RMD160 ab7399693479cc4c9bba276918d07b50fc8e119a SHA1 1fda0c55c890b7f0e898fad4167e55aa0a282486 SHA256 2af2f9bd9c4ab4455e3d3da3bfe67b4a65d81dc8efbacf75140913ef56e77cca
@@ -12,7 +9,7 @@ MISC metadata.xml 421 RMD160 6cfe519ed62f8c3bf6061b0b263e59d7cea5e7b7 SHA1 ab68b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk25QXcACgkQuUQtlDBCeQImwgCfTCQKuh+mqTfyqoiCiPy+knqb
-9Q8An2IlX2GrflbjRbkuX8TtSoBauxkG
-=/o21
+iF4EAREIAAYFAk25aZwACgkQXkR9YqOcLPG4ngD/RYPdtEgcYYXrDYb8Mhf1In11
+xlgXBw8ZVu1M4C4zMSwA/2MYZqSVX5H1ZN5gXvkfOg6Fs9q66Jj9eBTmEF9VKw0s
+=7RG+
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/files/midori-0.2.9-libnotify-0.7.patch b/www-client/midori/files/midori-0.2.9-libnotify-0.7.patch
deleted file mode 100644
index c1c58408c59f..000000000000
--- a/www-client/midori/files/midori-0.2.9-libnotify-0.7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://bugs.launchpad.net/midori/+bug/710352
-
---- midori/midori-app.c
-+++ midori/midori-app.c
-@@ -42,6 +42,9 @@
- 
- #if HAVE_LIBNOTIFY
-     #include <libnotify/notify.h>
-+    #ifndef NOTIFY_CHECK_VERSION
-+    #define NOTIFY_CHECK_VERSION(x,y,z) 0
-+    #endif
- #endif
- 
- struct _MidoriApp
-@@ -1203,8 +1206,11 @@
-     if (notify_is_initted ())
-     {
-         NotifyNotification* note;
--
-+        #if NOTIFY_CHECK_VERSION(0, 7, 0)
-+        note = notify_notification_new (title, message, "midori");
-+        #else
-         note = notify_notification_new (title, message, "midori", NULL);
-+        #endif
-         notify_notification_show (note, NULL);
-         g_object_unref (note);
-     }
diff --git a/www-client/midori/midori-0.2.9-r1.ebuild b/www-client/midori/midori-0.2.9-r1.ebuild
deleted file mode 100644
index fe080ccb1d3c..000000000000
--- a/www-client/midori/midori-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.9-r1.ebuild,v 1.6 2011/03/21 22:22:44 nirbheek Exp $
-
-EAPI=3
-inherit eutils multilib python xfconf
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
-IUSE="doc gnome +html idn libnotify nls +unique"
-
-RDEPEND="libnotify? ( x11-libs/libnotify )
-	>=net-libs/libsoup-2.25.2:2.4
-	>=net-libs/webkit-gtk-1.1.1:2
-	>=dev-db/sqlite-3.0
-	dev-libs/libxml2:2
-	>=x11-libs/gtk+-2.10:2
-	gnome? ( net-libs/libsoup-gnome:2.4 )
-	idn? ( net-dns/libidn )
-	unique? ( dev-libs/libunique:1 )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-util/intltool
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	html? ( dev-python/docutils )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-
-	# moving docs to version-specific directory
-	sed -i -e "s:/${PN}/user/midori.html:/user/midori.html:g" midori/midori-browser.c || die
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
-		--prefix="/usr/" \
-		--libdir="/usr/$(get_libdir)" \
-		--docdir="/usr/share/doc/${PF}/html" \
-		--disable-docs \
-		--enable-addons \
-		$(use_enable doc apidocs) \
-		$(use_enable html userdocs) \
-		$(use_enable idn libidn) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable unique) \
-		--disable-vala \
-		configure || die
-}
-
-src_compile() {
-	# This is from dev-libs/boost, keep it synced
-	jobs=$( echo " ${MAKEOPTS} " | \
-		sed -e 's/ --jobs[= ]/ -j /g' \
-		-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
-		-e 's/ -j\>/ -j1/g' | \
-		( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi;
-		jobs="${j#-j}"; done; echo ${jobs} ) )
-	if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi;
-
-	./waf build ${NUMJOBS} || die
-}
-
-src_install() {
-	DESTDIR=${D} ./waf install || die
-	dodoc AUTHORS ChangeLog INSTALL TODO || die
-}