Don't disable PaX anymore wrt #351407 by Faustus.

(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

3 files changed, 95 insertions, 7 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 95262bebb48a..61e6c679ec4c 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/midori
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.45 2010/12/18 18:02:17 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.46 2011/01/16 18:32:50 ssuominen Exp $
+
+*midori-0.2.9-r1 (16 Jan 2011)
+
+  16 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> +midori-0.2.9-r1.ebuild,
+  midori-9999.ebuild:
+  Don't disable PaX anymore wrt #351407 by Faustus.
 
   18 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> midori-0.2.9.ebuild:
   Remove USE="vala" because it's not ready to be stabilized yet. Stabilize for
diff --git a/www-client/midori/midori-0.2.9-r1.ebuild b/www-client/midori/midori-0.2.9-r1.ebuild
new file mode 100644
index 000000000000..d9678e897572
--- /dev/null
+++ b/www-client/midori/midori-0.2.9-r1.ebuild
@@ -0,0 +1,84 @@
+# 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.1 2011/01/16 18:32:50 ssuominen Exp $
+
+EAPI=2
+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
+	>=net-libs/webkit-gtk-1.1.1
+	>=dev-db/sqlite-3.0
+	dev-libs/libxml2
+	>=x11-libs/gtk+-2.10:2
+	gnome? ( net-libs/libsoup-gnome )
+	idn? ( net-dns/libidn )
+	unique? ( dev-libs/libunique )"
+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() {
+	# 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
+}
+
+pkg_postinst() {
+	xfconf_pkg_postinst
+	ewarn "Midori tends to crash due to bugs in WebKit."
+	ewarn "Report bugs at http://www.twotoasts.de/bugs"
+}
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index f841cce96782..8a9dc5174c22 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-9999.ebuild,v 1.23 2010/11/08 02:45:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.24 2011/01/16 18:32:50 ssuominen Exp $
 
 EAPI=2
-inherit pax-utils eutils multilib python xfconf git
+inherit eutils multilib python xfconf git
 
 DESCRIPTION="A lightweight web browser based on WebKitGTK+"
 HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -73,8 +73,6 @@ src_compile() {
 src_install() {
 	DESTDIR=${D} ./waf install || die
 	dodoc AUTHORS ChangeLog INSTALL TODO || die
-
-	pax-mark -m "${D}"/usr/bin/midori #338561
 }
 
 pkg_postinst() {