old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 13 insertions, 165 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 4760daeb8330..7b66f6351003 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.122 2014/04/05 13:08:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.123 2014/04/05 13:09:15 ssuominen Exp $
+
+  05 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/midori-0.5.7-underlinking.patch, -midori-0.5.7.ebuild:
+  old
 
 *midori-0.5.8 (05 Apr 2014)
 
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 29ce933acba7..fd8cfefa646f 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX midori-0.5.7-underlinking.patch 781 SHA256 72395772fc2021fa3e190d04677178384fa312e88c75ce68d3be4022e6c5f602 SHA512 c2b32dad7e88a882f6dfafed7da515375c11ae598419be3cb1af253ff99837d818dcb9d1fe3437e4f308f0c128c7cd03d59f52712220f17dd67bbe8dcecf5b09 WHIRLPOOL dceb3a215d148111ecfe829b4a49a07051b79b472e8d7a697565a8e9d60591161a538671fc18ea1e49aef8dfead579de8d5c26e460b118258c78166aa666022b
 DIST midori_0.5.5_all_.tar.bz2 1092309 SHA256 ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62 SHA512 89d1ddb461af460a83744cc761989d430750dcef9565ac98960c1c87e6082ebb35e61c4f21f28891a19119e2733dc8a6440bc51c0bd206c37ac068e434fc0231 WHIRLPOOL 699cf9792b6ce070cdaa29fe06db3c6d75bca23797252028925e1bee5a66704881653c39e2257bfcb861d4c82205605f2d4f38e8b708d559318284af81e1a73a
-DIST midori_0.5.7_all_.tar.bz2 1191260 SHA256 2875bb2aa8a8a0cce342178f04700d4ebccd13bf1b2ad4cb3ba9fec7e2bd0b4d SHA512 493ace56d144d8b554e1dcd9d93f3ab97167b42f12190418a59b49ae7354a60be89c2611eaee728832f8acec417fe8759f00a0a6a1b210a4896557012e79286a WHIRLPOOL d28b5893f05c482218f569ee1996b74f77b3401ada9e6e77c674fc9b1c486af3ca9d1c38583e80ddf126d90b6b7b223c21f1e2ca1e78e20c756f3762430aaa08
 DIST midori_0.5.8_all_.tar.bz2 1267130 SHA256 af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381 SHA512 3c1129324b05301502dfa4ad9147a160c7af269424451d2afba7ff2d455232274b2322699011950355cb406405bf2e38668e9cb56b748ecb87afdfd3a0e375e5 WHIRLPOOL fcc4a1c3e1b4968d0feb06b01742ba06b2ac1b0f28c17fb4369300a1cba94937a21e3aff5c2142e160fd54743ffb5d2996df38bbd88dd6aefd7a9e0a28a92a07
 EBUILD midori-0.5.5.ebuild 2855 SHA256 24dea6b9956b93cdcce0466549069dec43ceaa49417e64e2b3228a4a610040e0 SHA512 ebb5c8aad0bab9dc07556cb2d4dcec8980817ef9f479d8ff44869b365d3c3ba98f9d9bcccc21be8ee5e767545a91013621a8853cff19a913b5e48a8e62766fa1 WHIRLPOOL acf03627e0760a2e94f1c9f57fef0b537796bd70b2df5ead8952e4715aca21a0b0392d18ba02395b603c3171c313980ebca4c6c5912bee0b1a68d82f8f34c14d
-EBUILD midori-0.5.7.ebuild 2857 SHA256 7e524162e7ce1ef0692f37147a4f77fda4745e06d190b24fcc889af6e53f934e SHA512 b3c8fa9f1a42eeb0d247d914b6cc4eda95ccf07c1e861cdb32bbbf33304f7efb1c8bcb8467329b7268aeb18e72768ec16995a1a02cb7ffe0a8732d888e967919 WHIRLPOOL 0baa37e4712ea6b5e637737e8869b195899ebfdd1de38e509f3bc510a368161dd4cb83768249e31bd074113db143b2836b600d9642ca47f97fe5fa514ebb4e97
 EBUILD midori-0.5.8.ebuild 2934 SHA256 83d0ad4e5ea57dc073ff4096bea67ea21562b1f769749f2b4a86b5392eb72f8e SHA512 4b1a4b1135c14cb22d2332ce8706a7a60d7b5904ed6a49e9ad73c8664e37098588f9645d2ae095693c5edad777bdfebfc615d3d0d2064fe6462abeefb1b69b21 WHIRLPOOL 2ecf46862d9244bf61abc15778adc625e89f0bcd43a22a0d386362b033d4678d98c0e1da08f60954dade25696f96fb5c0477d02b5a139bdf2dd4473cfbceadfe
-MISC ChangeLog 18148 SHA256 a7eba6c62a160410cb37db0269354d2bd0682defbc468ff9e388583f468d5551 SHA512 241ba8de5c25c6675f81f24e2cecf123a963551b6f853f7ed08f4852fd5bb1fecaa6d93544c85b192755a121ac117e39b2e7b4eb80c41d771970baef4669cfc8 WHIRLPOOL 9b0a3063332b94b97b2455aa2a55eb7dbd4df6c8209af4251e42bdc6f0cba6f1ee0bd2fa34861bccc352d676550b8737c5462e695d838e07a408554829a56505
+MISC ChangeLog 18273 SHA256 3904712379e5ca2022fd513bb1502286d0ade0ccb58fa59bc5a291822e48a146 SHA512 38eeb0539605d3825185a8e652880a7692fc2f049c832cd0ae932db84d7b84dd2e16719f2defd9451ecff744fa0a5c76c6f5254e828cc27894ba176e23b3a042 WHIRLPOOL cb3b2ba3587a3b0677422a3e2916afd909949ee8535c291d7b1ceb46107bc38b509a857d520d0bf8c3f36099d3994a14001a5b67e700b965be8760d0af85af96
 MISC metadata.xml 698 SHA256 e5159b309d3060133cc0776a8f5e936bf7bb27a8b4d382d122fc68c1d1745a35 SHA512 e8119fd0d98542eea6e654b1a33d9968ac385ab2d0a00b18908ac8d25dc6020251d905f1b8f272805082a78662ce192411394cdeed63ab1dab1bb680c7bae019 WHIRLPOOL 3d9a43fe94fd91851a1908f12fc1ba290603874bb3f9d0a609dd138b91f953fa0b608d82e5d629581df54b09231d05293e5aaad5b7e00d0d2d5a614dc1638b45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTP/7qAAoJEEdUh39IaPFNGFoH/0nHB+uZl0CqwyNkF2RbYzXG
-JG7cTdc1Fs17qw/SBGCapoIealru7qrk+ASAQCaKgAfRy6n7CiCOOtvj0KJP2uuT
-MOwRXqAkBo9h4Rl0qC0W2b2/S0Sga9Clk1JbtpdDN1CDSd0h3AZfKwm3qEEfPhrT
-Q8qRO7XA7Ffazq4fmBg/+9poBhj+DyljYiYMYOojqDm5p+5EoNwg/DH4JVh/AZBz
-EHUGNswAvmiyn+y8Uglch4cx/OrQDKg0yxH3TSmWQK7pyfapC2G0ybimWilDglmN
-0Hs3CVZZt2WnhCuT99hwFr0G1Vg3ksiXcV114fd58OM4i0tdXXFBHZKMoOWJLwk=
-=f71F
+iQEcBAEBCAAGBQJTP/8kAAoJEEdUh39IaPFN7CwH/js0yIRH4pP1TwHGSTgGbuLg
+0QGnO0PCqM0IFL8NZdr1VHv/Ybdx1rB2CTUAw3/btst94ZkzSL+Ah2LPcVyqe4PN
+KkdjX8UJIInukTnVEPnq0Fk9bSUHXoMTIszMxWPAu5sdO5YFz7E0pdBstZC792U+
+Qoab0e/2dAfeoEPZ2qm0VoNbM10iS9Khzkg+Cf4witZGsUZalUdCDINIE9gCFL2n
+ACgBfvZrPIoL2lGObzaSc4slXYaWyxcA/sowIBJpyPiiuHUxIqL4ztFXz1Hvy0Qd
+fdfybgIt5AzdMgDJeskf83OGB+SXOzfRi+e3PylTlyPffSe+6VlhO3m7x+TKFXQ=
+=sKck
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/files/midori-0.5.7-underlinking.patch b/www-client/midori/files/midori-0.5.7-underlinking.patch
deleted file mode 100644
index 3a336527b9b1..000000000000
--- a/www-client/midori/files/midori-0.5.7-underlinking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.launchpad.net/midori/+bug/1299515
-
-midori/sokoke.c is using XGetWindowProperty() and XFree(), therefore link against -lX11 to prevent
-underlinking failures like "error: undefined reference to 'XGetWindowProperty'" and
-"error: undefined reference to 'XFree'"
-
-$ ld -v 
-GNU gold (GNU Binutils 2.24) 1.11
-    ^^^^
-
-$ emerge --info |grep LDFLAGS
-LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
-                 ^^^^^^^^^^^^^^^
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -77,7 +77,7 @@
-     find_library (XSS Xss /usr/lib/X11R6/lib)
-     if (SCRNSAVER AND XSS)
-         add_definitions("-DHAVE_X11_EXTENSIONS_SCRNSAVER_H")
--        set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS}")
-+        set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${XSS};${X11}")
-     endif ()
- endif ()
- 
diff --git a/www-client/midori/midori-0.5.7.ebuild b/www-client/midori/midori-0.5.7.ebuild
deleted file mode 100644
index 7f9d966dbd1e..000000000000
--- a/www-client/midori/midori-0.5.7.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.7.ebuild,v 1.2 2014/03/29 13:23:33 ssuominen Exp $
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.16
-
-PYTHON_COMPAT=( python2_7 )
-
-unset _live_inherits
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
-	_live_inherits=git-2
-else
-	KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
-	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
-fi
-
-inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.midori-browser.org/"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-IUSE="deprecated doc granite +jit +webkit2 zeitgeist"
-
-RDEPEND=">=dev-db/sqlite-3.6.19:3
-	>=dev-libs/glib-2.32.3
-	dev-libs/libxml2
-	>=net-libs/libsoup-2.38:2.4
-	>=net-libs/libsoup-gnome-2.38:2.4
-	>=x11-libs/libnotify-0.7
-	x11-libs/libXScrnSaver
-	deprecated? (
-		>=net-libs/webkit-gtk-1.8.1:2[jit=]
-		>=x11-libs/gtk+-2.24:2
-		)
-	!deprecated? (
-		>=app-crypt/gcr-3
-		x11-libs/gtk+:3
-		webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
-		!webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
-		)
-	granite? ( >=dev-libs/granite-0.2 )
-	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-util/intltool
-	gnome-base/librsvg
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-REQUIRED_USE="webkit2? ( !deprecated )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	vala_src_prepare
-	sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		$(cmake-utils_use_use doc APIDOCS)
-		$(cmake-utils_use_use granite)
-		$(cmake-utils_use_use zeitgeist)
-		-DVALA_EXECUTABLE="${VALAC}"
-		)
-
-	if use deprecated; then
-		mycmakeargs+=(
-			-DUSE_GTK3=OFF
-			-DHALF_BRO_INCOM_WEBKIT2=OFF
-			)
-	else
-		mycmakeargs+=(
-			-DUSE_GTK3=ON
-			$(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
-			)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local jit_is_enabled
-	if use deprecated; then
-		has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
-	else
-		has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
-	fi
-	[[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}