Version bump, bug 297352

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

3 files changed, 18 insertions, 11 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 770c0a07cd22..a48d12129115 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,12 @@
 # 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.22 2009/11/16 15:37:53 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.23 2009/12/25 02:18:19 darkside Exp $
+
+*midori-0.2.2 (25 Dec 2009)
+
+  25 Dec 2009; Jeremy Olexa <darkside@gentoo.org> -midori-0.1.10.ebuild,
+  +midori-0.2.2.ebuild:
+  Version bump, bug 297352
 
 *midori-0.2.1 (16 Nov 2009)
 
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 55e9f23f8ac4..03c890390031 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,9 +1,9 @@
-DIST midori-0.1.10.tar.bz2 543882 RMD160 b3e365b3dbc2896387c249e8f84578544a3a7404 SHA1 9598de84d9c3283f236c3a075eb707b9423967e3 SHA256 1f6a3af09ea9b9669c4b1a7ca2a8cbee5114dac2612e6f5ced1ea7ea4967fbfc
 DIST midori-0.2.0.tar.bz2 570091 RMD160 e541c532ee30871b235b2ddfc3551319db635b3f SHA1 dddf111d8d1eee0e6028183ccdab39cd96b43c13 SHA256 97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a
 DIST midori-0.2.1.tar.bz2 594189 RMD160 8deb5f5a5d4b39ee0c83982a6fd848c004381980 SHA1 5e6e9b055cf130f30a287886d908f8a672e66e0a SHA256 7d79a45331cfcf002ccd5a386b5597f91e0ee048b2b040a57c6faebc02bba79c
-EBUILD midori-0.1.10.ebuild 1971 RMD160 71517fd467df5d0baf3bc67a5f52d700953a0829 SHA1 522b9d28e1ae8d6bcb7f58d9122bd10737bf3221 SHA256 cf58e2d404ba1e947281d37c1343d8f7aa9548a9207a05a767f9f04c06cf4c05
+DIST midori-0.2.2.tar.bz2 613546 RMD160 37c84235d92cd458dfa1e05834bf531797384e4a SHA1 053718ef0c907d5fb905d3cd71b053460a9b1927 SHA256 bec38745947b79a80352374937cecb81fd21d30c35f11b11290fabdad1e4cb07
 EBUILD midori-0.2.0.ebuild 1979 RMD160 88f96779d116c477d268aa6268432a79a2eacb89 SHA1 41799663f273839b4d1eaa202747df7d173a17ce SHA256 e6032a0fd9e5cdf5948f159178b860a61c12d638ce10e02d523091b522da5a07
 EBUILD midori-0.2.1.ebuild 1980 RMD160 0aeb90d6f7fe5e1b433c652f3455652f036b4278 SHA1 972eb771c7e188107c110693500225490f1c2d6a SHA256 37fb50c01f8197484dfdbd840cc3d4c65c4c3981549dda9a9469b6765d3e1c7e
+EBUILD midori-0.2.2.ebuild 2028 RMD160 cd6804f87b2f344e508c73d4bae459eac2b578e1 SHA1 0b8ecd5c806991a4e2e25c06a08ba15b764a06ce SHA256 88f2d0b1b4d16e372d10579bf6af1e000bef93f35f1680f28b0cbe4491c89521
 EBUILD midori-9999.ebuild 1976 RMD160 1aecb3f32006340f3e22f3766696661c7605441e SHA1 7dc95d0c7ee142c52dfd556689343c84634f0010 SHA256 62854935b83f9f714ed9d95ee5f840e6893d33d7855004ca316e7ab23c3cd684
-MISC ChangeLog 3519 RMD160 0325f42a081adf89c7c1e0dd1926ded8786aeedf SHA1 33dc4eaf36e45e2d27d83128fa9f7a7b9f3e2ef6 SHA256 5137ec920a6ed81b097bf68922ad3409188969bd1d80d83b6e1551c91a4e5a14
+MISC ChangeLog 3673 RMD160 924d6312506527f20e43219937cc9ba42035ec30 SHA1 515a0b9df8100d276dfaa9ad986790524dc8602f SHA256 a94e1c3fedf4996d6846956b1e800103772960d129b51e53620f6cc90f064ef8
 MISC metadata.xml 290 RMD160 ca55fa90594e529d6c3e9958dbe996e4f30499c9 SHA1 7d2d10b55d003cfa795c5fa9a4371fb48fb5748f SHA256 4b570f38dc8612ef354f8ccede3fb440d35000605ad26eabf6ac441af749436a
diff --git a/www-client/midori/midori-0.1.10.ebuild b/www-client/midori/midori-0.2.2.ebuild
index 2c6fa8e52431..c9abe1cfa773 100644
--- a/www-client/midori/midori-0.1.10.ebuild
+++ b/www-client/midori/midori-0.2.2.ebuild
@@ -1,13 +1,13 @@
 # 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.3 2009/11/07 19:15:28 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.2.ebuild,v 1.1 2009/12/25 02:18:19 darkside Exp $
 
 EAPI=2
 inherit xfconf multilib
 
-DESCRIPTION="A lightweight web browser"
+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.1/${P}.tar.bz2"
+SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -18,7 +18,7 @@ RDEPEND="libnotify? ( x11-libs/libnotify )
 	>=net-libs/libsoup-2.25.2
 	>=net-libs/webkit-gtk-1.1.1
 	dev-libs/libxml2
-	x11-libs/gtk+
+	>=x11-libs/gtk+-2.10:2
 	gnome? ( net-libs/libsoup[gnome] )
 	idn? ( net-dns/libidn )
 	sqlite? ( >=dev-db/sqlite-3.0 )
@@ -33,8 +33,8 @@ DEPEND="${RDEPEND}
 
 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
+	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() {
@@ -42,9 +42,11 @@ src_configure() {
 		--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) \
@@ -58,7 +60,6 @@ src_compile() {
 
 src_install() {
 	DESTDIR=${D} ./waf install || die "install failed"
-	rm -r "${D}"/usr/share/doc/${PN}
 	dodoc AUTHORS ChangeLog INSTALL TODO || die "dodoc failed"
 }