| 1 |
ssuominen 10/11/01 19:41:13 |
| 2 |
|
| 3 |
Modified: ChangeLog midori-9999.ebuild |
| 4 |
Added: midori-0.2.9.ebuild |
| 5 |
Log: |
| 6 |
Version bump. Fix docdir handling on both -0.2.9 and -9999. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha1/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.40 www-client/midori/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.40&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.40&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.39&r2=1.40 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v |
| 20 |
retrieving revision 1.39 |
| 21 |
retrieving revision 1.40 |
| 22 |
diff -u -r1.39 -r1.40 |
| 23 |
--- ChangeLog 23 Oct 2010 13:00:01 -0000 1.39 |
| 24 |
+++ ChangeLog 1 Nov 2010 19:41:13 -0000 1.40 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for www-client/midori |
| 27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.39 2010/10/23 13:00:01 ssuominen Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.40 2010/11/01 19:41:13 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+*midori-0.2.9 (01 Nov 2010) |
| 32 |
+ |
| 33 |
+ 01 Nov 2010; Samuli Suominen <ssuominen@g.o> +midori-0.2.9.ebuild, |
| 34 |
+ midori-9999.ebuild: |
| 35 |
+ Version bump. Fix docdir handling on both -0.2.9 and -9999. |
| 36 |
|
| 37 |
23 Oct 2010; Samuli Suominen <ssuominen@g.o> midori-0.2.8.ebuild, |
| 38 |
midori-9999.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.22 www-client/midori/midori-9999.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.22&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.22&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?r1=1.21&r2=1.22 |
| 47 |
|
| 48 |
Index: midori-9999.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v |
| 51 |
retrieving revision 1.21 |
| 52 |
retrieving revision 1.22 |
| 53 |
diff -u -r1.21 -r1.22 |
| 54 |
--- midori-9999.ebuild 23 Oct 2010 13:00:01 -0000 1.21 |
| 55 |
+++ midori-9999.ebuild 1 Nov 2010 19:41:13 -0000 1.22 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2010 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.21 2010/10/23 13:00:01 ssuominen Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.22 2010/11/01 19:41:13 ssuominen Exp $ |
| 61 |
|
| 62 |
EAPI=2 |
| 63 |
inherit pax-utils eutils multilib python xfconf git |
| 64 |
@@ -40,8 +40,7 @@ |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
# moving docs to version-specific directory |
| 68 |
- sed -i -e "s:\${DOCDIR}/${PN}:\${DOCDIR}/${PF}/:g" wscript || die |
| 69 |
- sed -i -e "s:/${PN}/user/midori.html:/${PF}/user/midori.html:g" midori/midori-browser.c || die |
| 70 |
+ sed -i -e "s:/${PN}/user/midori.html:/user/midori.html:g" midori/midori-browser.c || die |
| 71 |
} |
| 72 |
|
| 73 |
src_configure() { |
| 74 |
@@ -50,6 +49,7 @@ |
| 75 |
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \ |
| 76 |
--prefix="/usr/" \ |
| 77 |
--libdir="/usr/$(get_libdir)" \ |
| 78 |
+ --docdir="/usr/share/doc/${PF}/html" \ |
| 79 |
--disable-docs \ |
| 80 |
--enable-addons \ |
| 81 |
$(use_enable doc apidocs) \ |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.1 www-client/midori/midori-0.2.9.ebuild |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.2.9.ebuild?rev=1.1&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.2.9.ebuild?rev=1.1&content-type=text/plain |
| 89 |
|
| 90 |
Index: midori-0.2.9.ebuild |
| 91 |
=================================================================== |
| 92 |
# Copyright 1999-2010 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.9.ebuild,v 1.1 2010/11/01 19:41:13 ssuominen Exp $ |
| 95 |
|
| 96 |
EAPI=2 |
| 97 |
inherit pax-utils eutils multilib python xfconf |
| 98 |
|
| 99 |
DESCRIPTION="A lightweight web browser based on WebKitGTK+" |
| 100 |
HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html" |
| 101 |
SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2" |
| 102 |
|
| 103 |
LICENSE="LGPL-2" |
| 104 |
SLOT="0" |
| 105 |
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd" |
| 106 |
IUSE="doc gnome +html idn libnotify nls +unique vala" |
| 107 |
|
| 108 |
RDEPEND="libnotify? ( x11-libs/libnotify ) |
| 109 |
>=net-libs/libsoup-2.25.2 |
| 110 |
>=net-libs/webkit-gtk-1.1.1 |
| 111 |
>=dev-db/sqlite-3.0 |
| 112 |
dev-libs/libxml2 |
| 113 |
>=x11-libs/gtk+-2.10:2 |
| 114 |
gnome? ( net-libs/libsoup-gnome ) |
| 115 |
idn? ( net-dns/libidn ) |
| 116 |
unique? ( dev-libs/libunique ) |
| 117 |
vala? ( dev-lang/vala:0 )" |
| 118 |
DEPEND="${RDEPEND} |
| 119 |
|| ( dev-lang/python:2.7 dev-lang/python:2.6 ) |
| 120 |
dev-util/intltool |
| 121 |
dev-util/pkgconfig |
| 122 |
doc? ( dev-util/gtk-doc ) |
| 123 |
html? ( dev-python/docutils ) |
| 124 |
nls? ( sys-devel/gettext )" |
| 125 |
|
| 126 |
pkg_setup() { |
| 127 |
python_set_active_version 2 |
| 128 |
} |
| 129 |
|
| 130 |
src_prepare() { |
| 131 |
# moving docs to version-specific directory |
| 132 |
sed -i -e "s:/${PN}/user/midori.html:/user/midori.html:g" midori/midori-browser.c || die |
| 133 |
} |
| 134 |
|
| 135 |
src_configure() { |
| 136 |
strip-linguas -i po |
| 137 |
|
| 138 |
CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf \ |
| 139 |
--prefix="/usr/" \ |
| 140 |
--libdir="/usr/$(get_libdir)" \ |
| 141 |
--docdir="/usr/share/doc/${PF}/html" \ |
| 142 |
--disable-docs \ |
| 143 |
--enable-addons \ |
| 144 |
$(use_enable doc apidocs) \ |
| 145 |
$(use_enable html userdocs) \ |
| 146 |
$(use_enable idn libidn) \ |
| 147 |
$(use_enable libnotify) \ |
| 148 |
$(use_enable nls) \ |
| 149 |
$(use_enable unique) \ |
| 150 |
$(use_enable vala) \ |
| 151 |
configure || die |
| 152 |
} |
| 153 |
|
| 154 |
src_compile() { |
| 155 |
# This is from dev-libs/boost, keep it synced |
| 156 |
jobs=$( echo " ${MAKEOPTS} " | \ |
| 157 |
sed -e 's/ --jobs[= ]/ -j /g' \ |
| 158 |
-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \ |
| 159 |
-e 's/ -j\>/ -j1/g' | \ |
| 160 |
( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; |
| 161 |
jobs="${j#-j}"; done; echo ${jobs} ) ) |
| 162 |
if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi; |
| 163 |
|
| 164 |
./waf build ${NUMJOBS} || die |
| 165 |
} |
| 166 |
|
| 167 |
src_install() { |
| 168 |
DESTDIR=${D} ./waf install || die |
| 169 |
dodoc AUTHORS ChangeLog INSTALL TODO || die |
| 170 |
|
| 171 |
pax-mark -m "${D}"/usr/bin/midori #338561 |
| 172 |
} |
| 173 |
|
| 174 |
pkg_postinst() { |
| 175 |
xfconf_pkg_postinst |
| 176 |
ewarn "Midori tends to crash due to bugs in WebKit." |
| 177 |
ewarn "Report bugs at http://www.twotoasts.de/bugs" |
| 178 |
} |
Archives