Version bump, cleanup old. New ebuild by Jn Aniŝĉu, bug 279768

(Portage version: 2.1.6.13/cvs/Linux x86_64)

6 files changed, 79 insertions, 151 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 9854af9339cb..64f398a12056 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.16 2009/08/22 16:18:22 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.17 2009/09/14 14:31:22 darkside Exp $
+
+*midori-0.1.10 (14 Sep 2009)
+
+  14 Sep 2009; Jeremy Olexa <darkside@gentoo.org> -midori-0.1.2.ebuild,
+  -midori-0.1.5.ebuild, -midori-0.1.8.ebuild, +midori-0.1.10.ebuild,
+  metadata.xml:
+  Version bump, cleanup old. New ebuild by Jn Aniŝĉu, bug 279768
 
   22 Aug 2009; Jeremy Olexa <darkside@gentoo.org> midori-9999.ebuild:
   Update EGIT_REPO_URI, bug 281859
diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index a60663090ec0..4f17aa6b3f98 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>xfce</herd>
-<maintainer>
-  <email>chainsaw@gentoo.org</email>
-  <name>Tony Vroon</name>
-</maintainer>
 <use>
+	<flag name="html">Install HTML documentation</flag>
 	<flag name="soup">Use Soup (<pkg>net-libs/libsoup</pkg>) as HTTP backend instead of curl(<pkg>net-misc/curl</pkg>), if you want better gnome integration for URL processing</flag>
+	<flag name="unique">Optional libunique support</flag>
 </use>
 </pkgmetadata>
diff --git a/www-client/midori/midori-0.1.10.ebuild b/www-client/midori/midori-0.1.10.ebuild
new file mode 100644
index 000000000000..5682c5e80f04
--- /dev/null
+++ b/www-client/midori/midori-0.1.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.1.10.ebuild,v 1.1 2009/09/14 14:31:22 darkside Exp $
+
+EAPI="2"
+inherit xfconf multilib
+
+DESCRIPTION="A lightweight web browser"
+HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+SRC_URI="http://archive.xfce.org/src/apps/${PN}/0.1/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc gnome html idn libnotify nls +sqlite +unique"
+
+RDEPEND="libnotify? ( x11-libs/libnotify )
+	>=net-libs/libsoup-2.25.2
+	>=net-libs/webkit-gtk-1.1.1
+	dev-libs/libxml2
+	x11-libs/gtk+
+	gnome? ( net-libs/libsoup[gnome] )
+	idn? ( net-dns/libidn )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	unique? ( dev-libs/libunique )"
+
+DEPEND="${RDEPEND}
+	dev-lang/python
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	html? ( dev-python/docutils )
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	# moving docs to version-specific directory
+	sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript
+	sed -i -e "s:/${PN}/user/midori.html:/${PF}/user/midori.html:g" midori/midori-browser.c
+}
+
+src_configure() {
+	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \
+		--prefix="/usr/" \
+		--libdir="/usr/$(get_libdir)" \
+		--disable-docs \
+		$(use_enable doc apidocs) \
+		$(use_enable html userdocs) \
+		$(use_enable idn libidn) \
+		$(use_enable nls nls) \
+		$(use_enable sqlite) \
+		$(use_enable unique) \
+		configure || die "configure failed"
+}
+
+src_compile() {
+	NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS})
+	./waf build ${NUMJOBS} || die "build failed"
+}
+
+src_install() {
+	DESTDIR=${D} ./waf install || die "install failed"
+	rm -r ${D}/usr/share/doc/${PN}
+	dodoc AUTHORS ChangeLog INSTALL TODO || die "dodoc failed"
+}
+
+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-0.1.2.ebuild b/www-client/midori/midori-0.1.2.ebuild
deleted file mode 100644
index 8e43e91e3d18..000000000000
--- a/www-client/midori/midori-0.1.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.1.2.ebuild,v 1.3 2009/05/15 08:46:05 aballier Exp $
-
-EAPI=2
-
-inherit multilib gnome2-utils
-
-DESCRIPTION="A lightweight web browser"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="http://goodies.xfce.org/releases/midori/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="nls soup sqlite"
-
-DEPEND=">=dev-lang/python-2.4
-	x11-libs/gtk+
-	net-libs/webkit-gtk
-	dev-libs/libxml2
-	nls? ( sys-devel/gettext )
-	soup? ( >=net-libs/libsoup-2.4 )
-	sqlite? ( >=dev-db/sqlite-3.0 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	./waf \
-		--prefix="/usr/" \
-		--libdir="/usr/$(get_libdir)" \
-		configure || die "configure failed"
-}
-
-src_compile() {
-	./waf build || die "build failed"
-}
-
-src_install() {
-	DESTDIR=${D} ./waf install || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL TODO
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	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-0.1.5.ebuild b/www-client/midori/midori-0.1.5.ebuild
deleted file mode 100644
index 65eaa7ced736..000000000000
--- a/www-client/midori/midori-0.1.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.1.5.ebuild,v 1.4 2009/05/15 08:46:05 aballier Exp $
-
-EAPI=2
-
-inherit multilib gnome2-utils
-
-DESCRIPTION="A lightweight web browser"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="http://goodies.xfce.org/releases/midori/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="soup sqlite"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=net-libs/webkit-gtk-0_p42000
-	soup? ( >=net-libs/libsoup-0.9 )
-	sqlite? ( >=dev-db/sqlite-3.0 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_configure() {
-	./waf \
-		--prefix="/usr/" \
-		--libdir="/usr/$(get_libdir)" \
-		configure || die "configure failed"
-}
-
-src_compile() {
-	./waf build || die "build failed"
-}
-
-src_install() {
-	DESTDIR=${D} ./waf install || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL TODO
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	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-0.1.8.ebuild b/www-client/midori/midori-0.1.8.ebuild
deleted file mode 100644
index 864f6d861e8a..000000000000
--- a/www-client/midori/midori-0.1.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.1.8.ebuild,v 1.1 2009/07/27 18:15:32 chainsaw Exp $
-
-EAPI=2
-
-inherit multilib gnome2-utils
-
-DESCRIPTION="A lightweight web browser"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="http://goodies.xfce.org/releases/midori/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="idn soup sqlite"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=net-libs/webkit-gtk-0_p42000
-	dev-libs/libunique
-	dev-libs/libxml2
-	idn? ( net-dns/libidn )
-	soup? ( >=net-libs/libsoup-2.25.5 )
-	sqlite? ( >=dev-db/sqlite-3.0 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_configure() {
-	./waf \
-		--prefix="/usr/" \
-		--libdir="/usr/$(get_libdir)" \
-		configure || die "configure failed"
-}
-
-src_compile() {
-	./waf build || die "build failed"
-}
-
-src_install() {
-	DESTDIR=${D} ./waf install || die "install failed"
-	dodoc AUTHORS ChangeLog INSTALL TODO
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	ewarn "Midori tends to crash due to bugs in WebKit."
-	ewarn "Report bugs at http://www.twotoasts.de/bugs"
-}