From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PD0Fu-0006xF-LF for garchives@archives.gentoo.org; Mon, 01 Nov 2010 19:41:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DF14E064A; Mon, 1 Nov 2010 19:41:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D3634E064A for ; Mon, 1 Nov 2010 19:41:16 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 239AA1B4170 for ; Mon, 1 Nov 2010 19:41:16 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2166) id EA13820051; Mon, 1 Nov 2010 19:41:13 +0000 (UTC) From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-client/midori: midori-0.2.9.ebuild ChangeLog midori-9999.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: midori-0.2.9.ebuild ChangeLog midori-9999.ebuild X-VCS-Directories: www-client/midori X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Message-Id: <20101101194113.EA13820051@flycatcher.gentoo.org> Date: Mon, 1 Nov 2010 19:41:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4b27d9be-e3de-4167-b397-98e6888926b1 X-Archives-Hash: d8e023c2ab34863b51d341f195d3bd74 ssuominen 10/11/01 19:41:13 Modified: ChangeLog midori-9999.ebuild Added: midori-0.2.9.ebuild Log: Version bump. Fix docdir handling on both -0.2.9 and -9999. =20 (Portage version: 2.2.0_alpha1/cvs/Linux x86_64) Revision Changes Path 1.40 www-client/midori/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/= ChangeLog?rev=3D1.40&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/= ChangeLog?rev=3D1.40&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/= ChangeLog?r1=3D1.39&r2=3D1.40 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ChangeLog 23 Oct 2010 13:00:01 -0000 1.39 +++ ChangeLog 1 Nov 2010 19:41:13 -0000 1.40 @@ -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.39 20= 10/10/23 13:00:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.40 20= 10/11/01 19:41:13 ssuominen Exp $ + +*midori-0.2.9 (01 Nov 2010) + + 01 Nov 2010; Samuli Suominen +midori-0.2.9.ebui= ld, + midori-9999.ebuild: + Version bump. Fix docdir handling on both -0.2.9 and -9999. =20 23 Oct 2010; Samuli Suominen midori-0.2.8.ebuil= d, midori-9999.ebuild: 1.22 www-client/midori/midori-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/= midori-9999.ebuild?rev=3D1.22&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/= midori-9999.ebuild?rev=3D1.22&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/= midori-9999.ebuild?r1=3D1.21&r2=3D1.22 Index: midori-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- midori-9999.ebuild 23 Oct 2010 13:00:01 -0000 1.21 +++ midori-9999.ebuild 1 Nov 2010 19:41:13 -0000 1.22 @@ -1,6 +1,6 @@ # 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-9999.ebuild,= v 1.21 2010/10/23 13:00:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,= v 1.22 2010/11/01 19:41:13 ssuominen Exp $ =20 EAPI=3D2 inherit pax-utils eutils multilib python xfconf git @@ -40,8 +40,7 @@ =20 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 + sed -i -e "s:/${PN}/user/midori.html:/user/midori.html:g" midori/midori= -browser.c || die } =20 src_configure() { @@ -50,6 +49,7 @@ CCFLAGS=3D"${CFLAGS}" LINKFLAGS=3D"${LDFLAGS}" ./waf \ --prefix=3D"/usr/" \ --libdir=3D"/usr/$(get_libdir)" \ + --docdir=3D"/usr/share/doc/${PF}/html" \ --disable-docs \ --enable-addons \ $(use_enable doc apidocs) \ 1.1 www-client/midori/midori-0.2.9.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/= midori-0.2.9.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/= midori-0.2.9.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: midori-0.2.9.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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.9.ebuild,= v 1.1 2010/11/01 19:41:13 ssuominen Exp $ EAPI=3D2 inherit pax-utils eutils multilib python xfconf DESCRIPTION=3D"A lightweight web browser based on WebKitGTK+" HOMEPAGE=3D"http://www.twotoasts.de/index.php?/pages/midori_summary.html" SRC_URI=3D"mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2" LICENSE=3D"LGPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~arm ~ppc ~x86 ~x86-fbsd" IUSE=3D"doc gnome +html idn libnotify nls +unique vala" RDEPEND=3D"libnotify? ( x11-libs/libnotify ) >=3Dnet-libs/libsoup-2.25.2 >=3Dnet-libs/webkit-gtk-1.1.1 >=3Ddev-db/sqlite-3.0 dev-libs/libxml2 >=3Dx11-libs/gtk+-2.10:2 gnome? ( net-libs/libsoup-gnome ) idn? ( net-dns/libidn ) unique? ( dev-libs/libunique ) vala? ( dev-lang/vala:0 )" DEPEND=3D"${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=3D"${CFLAGS}" LINKFLAGS=3D"${LDFLAGS}" ./waf \ --prefix=3D"/usr/" \ --libdir=3D"/usr/$(get_libdir)" \ --docdir=3D"/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) \ $(use_enable vala) \ configure || die } src_compile() { # This is from dev-libs/boost, keep it synced jobs=3D$( echo " ${MAKEOPTS} " | \ sed -e 's/ --jobs[=3D ]/ -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}" =3D "$j" ]]; then continue; = fi; jobs=3D"${j#-j}"; done; echo ${jobs} ) ) if [[ "${jobs}" !=3D "" ]]; then NUMJOBS=3D"-j"${jobs}; fi; ./waf build ${NUMJOBS} || die } src_install() { DESTDIR=3D${D} ./waf install || die dodoc AUTHORS ChangeLog INSTALL TODO || die pax-mark -m "${D}"/usr/bin/midori #338561 } pkg_postinst() { xfconf_pkg_postinst ewarn "Midori tends to crash due to bugs in WebKit." ewarn "Report bugs at http://www.twotoasts.de/bugs" }