remove old, issues with USE=doc. bug 321315

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 5 insertions, 82 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 8bc4326d6663..c91bc68a723e 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,9 @@
 # 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.30 2010/05/24 18:06:11 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.31 2010/05/24 18:15:57 darkside Exp $
+
+  24 May 2010; Jeremy Olexa <darkside@gentoo.org> -midori-0.2.5.ebuild:
+  remove old, issues with USE=doc. bug 321315
 
 *midori-0.2.6 (24 May 2010)
 
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 2c2f201e1c3f..f66529b7972a 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,9 +1,7 @@
 DIST midori-0.2.4.tar.bz2 645554 RMD160 8291b66b23c80b1881c06a1f001789155a5fbf76 SHA1 41b11ff4a65256fc3fdcafb8151f60195d7f8845 SHA256 02a2b13e2ca51badae828b0a331af92f09ae3d6a9ab0a56e647544db64f7790f
-DIST midori-0.2.5.tar.bz2 705277 RMD160 1b70959b867a401f80da5223b6851e81f9b1f89d SHA1 ee7cfe6b960029becb4b4c37efc8ec8008e3be5d SHA256 88247235f3873d11f00e653adfbcc34b836e188b96b5d8a1c54d4de6fd940f2a
 DIST midori-0.2.6.tar.bz2 712959 RMD160 9086330cedc3dba15474dc0c6919fbffeba7d296 SHA1 c70f6d75e2ea2947dcf05201192b9405bb4036f4 SHA256 2da90265db44b23161e9b78ea5f78a42db8a10cfaae7dcf6287c880a4b2a6db2
 EBUILD midori-0.2.4.ebuild 2141 RMD160 0ebe102f6fade647c2780d563144768f08aa6db4 SHA1 66cec13bfe362285f8691673fa37e85dbc828cb5 SHA256 1ae02029bcbdfdcc1586e2a67b86382b82a958eb76d73389eee6a18f06b28d37
-EBUILD midori-0.2.5.ebuild 2140 RMD160 cf0da90bcf50d54b46213ac4befa0b295b41c224 SHA1 5343081f5616b7a112c5289a58f8c638817fd521 SHA256 d4e4bb2e30e56ff30eea3e8395559317fd1027f5beee0c763f772c74e32b306a
 EBUILD midori-0.2.6.ebuild 2140 RMD160 0bd2421c190e20b5f4cf4285242c96e503b3c924 SHA1 033a16089d9e1e54d76d0a0358bffd0b7dc6b3d0 SHA256 a175ac76b540f43e6db0111d6ff9541a4b97eece4b43283a3fdbd152065374a9
 EBUILD midori-9999.ebuild 2062 RMD160 d72c1e6dee68a854ee6b627514648fa882c36173 SHA1 06e9fbab9b566909bf9740d59b7fdef78465e734 SHA256 152ba0277d6761716f93e0bb88479492bd26f54c5479b4229e1919fdd48faa43
-MISC ChangeLog 4870 RMD160 00d4720475b1332d7729183b85425649213e7aeb SHA1 c82d71c3d8116b23d10c58c6149c1d589813500e SHA256 7de82e381ddb715f0629efbc4ca403d6ca3734e2713be418a9d8314527fa8938
+MISC ChangeLog 4989 RMD160 e411b9a46fee0c4feda11bc63ce25a4779b13947 SHA1 b04fb9bf0c27d77470bdc6443be434a107f472a3 SHA256 b8ad5e6aafa11082ae265801dfa30fb60a34840975e49bb94585ba828aefc8de
 MISC metadata.xml 290 RMD160 ca55fa90594e529d6c3e9958dbe996e4f30499c9 SHA1 7d2d10b55d003cfa795c5fa9a4371fb48fb5748f SHA256 4b570f38dc8612ef354f8ccede3fb440d35000605ad26eabf6ac441af749436a
diff --git a/www-client/midori/midori-0.2.5.ebuild b/www-client/midori/midori-0.2.5.ebuild
deleted file mode 100644
index 13a34fca01e5..000000000000
--- a/www-client/midori/midori-0.2.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.5.ebuild,v 1.1 2010/05/18 19:13:53 darkside Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2:2.6"
-
-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 +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+-2.10:2
-	gnome? ( net-libs/libsoup[gnome] )
-	idn? ( net-dns/libidn )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	unique? ( dev-libs/libunique )"
-DEPEND="${RDEPEND}
-	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:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript || die
-	sed -i -e "s:/${PN}/user/midori.html:/${PF}/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)" \
-		--disable-docs \
-		--enable-addons \
-		$(use_enable doc apidocs) \
-		$(use_enable html userdocs) \
-		$(use_enable idn libidn) \
-		$(use_enable libnotify) \
-		$(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"
-	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"
-}