* [gentoo-commits] gentoo-x86 commit in www-client/midori: midori-0.2.9.ebuild ChangeLog midori-9999.ebuild
@ 2010-11-01 19:41 Samuli Suominen (ssuominen)
0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2010-11-01 19:41 UTC (permalink / raw
To: gentoo-commits
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.
(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=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.39&r2=1.40
Index: ChangeLog
===================================================================
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 2010/10/23 13:00:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.40 2010/11/01 19:41:13 ssuominen Exp $
+
+*midori-0.2.9 (01 Nov 2010)
+
+ 01 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> +midori-0.2.9.ebuild,
+ midori-9999.ebuild:
+ Version bump. Fix docdir handling on both -0.2.9 and -9999.
23 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> midori-0.2.8.ebuild,
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=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?r1=1.21&r2=1.22
Index: midori-9999.ebuild
===================================================================
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 $
EAPI=2
inherit pax-utils eutils multilib python xfconf git
@@ -40,8 +40,7 @@
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
}
src_configure() {
@@ -50,6 +49,7 @@
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) \
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=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.2.9.ebuild?rev=1.1&content-type=text/plain
Index: midori-0.2.9.ebuild
===================================================================
# 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=2
inherit pax-utils 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 vala"
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 )
vala? ( dev-lang/vala:0 )"
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) \
$(use_enable 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
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"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-11-01 19:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-01 19:41 [gentoo-commits] gentoo-x86 commit in www-client/midori: midori-0.2.9.ebuild ChangeLog midori-9999.ebuild Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox