* [gentoo-commits] dev/jmbsvicetto:master commit in: dev-python/pyicu/, www-apps/dokuwiki/, sci-geosciences/osm-gps-map/files/, ...
@ 2015-07-01 17:24 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; only message in thread
From: Jorge Manuel B. S. Vicetto @ 2015-07-01 17:24 UTC (permalink / raw
To: gentoo-commits
commit: ee4f7cddbd87d561307eb64db84df12956701004
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 1 17:21:12 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jul 1 17:21:12 2015 +0000
URL: https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=ee4f7cdd
Drop depend.php from inherit - fixes bug 552858.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
app-misc/gramps/Manifest | 2 +
app-misc/gramps/files/gramps-resourcepath.patch | 11 +++
app-misc/gramps/files/gramps-use_bsddb3.patch | 11 +++
app-misc/gramps/gramps-3.4.9.ebuild | 78 +++++++++++++++++++
app-misc/gramps/gramps-4.1.3.ebuild | 51 +++++++++++++
dev-python/pyicu/Manifest | 1 +
dev-python/pyicu/metadata.xml | 8 ++
dev-python/pyicu/pyicu-1.9.2.ebuild | 50 ++++++++++++
sci-geosciences/osm-gps-map/Manifest | 2 +
.../files/osm-gps-map-fix-introspection.patch | 10 +++
.../osm-gps-map/osm-gps-map-0.7.3.ebuild | 88 ++++++++++++++++------
.../osm-gps-map/osm-gps-map-1.0.1.ebuild | 82 ++++++++++++++++++++
www-apps/dokuwiki/dokuwiki-20140505e.ebuild | 4 +-
www-apps/dokuwiki/dokuwiki-20140929d.ebuild | 6 +-
14 files changed, 374 insertions(+), 30 deletions(-)
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
new file mode 100644
index 0000000..fa39b9f
--- /dev/null
+++ b/app-misc/gramps/Manifest
@@ -0,0 +1,2 @@
+DIST gramps-3.4.9.tar.gz 10190446 SHA256 402a8616efeda730d10941690edb6dfb2719c3f7383e376a404577412676a8f3 SHA512 f15481b3791a98568a0a7f734ef5eb9a1149cf76c5e83f1270eee41bcf3518713391cb271a54177e6e6bbaf78da098d7a7a2a807266c971c1331dbb9d29d5fbb WHIRLPOOL 834777cb20ee7a3ef7a2397eef5a0e70caab02666cf127ba01f6310ac68463ea67733883cd3ca63676b9541dc104da818986d7b249950ae6a30415f5fa1bddee
+DIST gramps-4.1.3.tar.gz 17244017 SHA256 25501a01419c9a13e70574c57543e7bbac5d3b59760fac8027196a39e029fe8e SHA512 f52210f5e15ef3435d503f6b96b5a3960a4c6a4e3358d981514a2880801efdd6623eaed8237e5d9a08c26608670f6649967bb0e18500c480541d1e4866d668a8 WHIRLPOOL 08612469fd974aa304d47474c0127c3f660606261f2f3f682745bf46a0845242080bf454b2f77b5eb47985c80e1ffa5c0ad75cd97f0d3679515d015bac1e36a5
diff --git a/app-misc/gramps/files/gramps-resourcepath.patch b/app-misc/gramps/files/gramps-resourcepath.patch
new file mode 100644
index 0000000..b414e94
--- /dev/null
+++ b/app-misc/gramps/files/gramps-resourcepath.patch
@@ -0,0 +1,11 @@
+--- setup.py.old 2014-04-11 14:37:05.557343225 -0400
++++ setup.py 2014-04-11 14:37:30.560989056 -0400
+@@ -248,7 +248,7 @@
+ 'utils', 'resource-path')
+ with io.open(resource_file, 'w', encoding='utf-8',
+ errors='strict') as fp:
+- path = os.path.abspath(os.path.join(self.install_data, 'share'))
++ path = '/usr/share'
+ if sys.version_info[0] < 3:
+ path = unicode(path)
+ fp.write(path)
diff --git a/app-misc/gramps/files/gramps-use_bsddb3.patch b/app-misc/gramps/files/gramps-use_bsddb3.patch
new file mode 100644
index 0000000..930f408
--- /dev/null
+++ b/app-misc/gramps/files/gramps-use_bsddb3.patch
@@ -0,0 +1,11 @@
+--- gramps-4.1.1/gramps/gen/config.py.orig 2015-02-23 13:20:20.150291498 -0500
++++ gramps-4.1.1/gramps/gen/config.py 2015-02-23 13:20:37.260291400 -0500
+@@ -313,7 +313,7 @@
+ register('preferences.use-last-view', False)
+ register('preferences.last-view', '')
+ register('preferences.last-views', [])
+-register('preferences.use-bsddb3', False)
++register('preferences.use-bsddb3', True)
+ register('preferences.family-relation-type', 3) # UNKNOWN
+ register('preferences.age-display-precision', 1)
+ register('preferences.color-gender-male-alive', '#b8cee6')
diff --git a/app-misc/gramps/gramps-3.4.9.ebuild b/app-misc/gramps/gramps-3.4.9.ebuild
new file mode 100644
index 0000000..b5ee8a4
--- /dev/null
+++ b/app-misc/gramps/gramps-3.4.9.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="http://www.gramps-project.org/"
+SRC_URI="mirror://sourceforge/gramps/Stable/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="gnome reports spell webkit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/bsddb3[${PYTHON_USEDEP}]
+ dev-python/pygoocanvas[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.16.0[${PYTHON_USEDEP}]
+ gnome-base/librsvg:2
+ sci-geosciences/osm-gps-map
+ x11-misc/xdg-utils
+ gnome? (
+ dev-python/gconf-python[${PYTHON_USEDEP}]
+ dev-python/libgnome-python[${PYTHON_USEDEP}]
+ )
+ spell? ( dev-python/gtkspell-python[${PYTHON_USEDEP}] )
+ reports? ( media-gfx/graphviz )
+ webkit? ( dev-python/pywebkitgtk[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/libiconv
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-3.4.0-use_bsddb3.patch"
+
+ # Fix install path, bug 423315 for example
+ einfo "Fix installation path"
+ find . -iname 'Makefile.in' | xargs \
+ sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
+ || die
+ find . -iname 'Makefile.in' | xargs \
+ sed "s;\(pkgpythondir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
+ || die
+
+ sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
+ -i src/Makefile.in || die
+
+ sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
+ -i src/docgen/Makefile.in || die
+
+ einfo "Fix wrapper script"
+ sed "s;@datadir@;$(python_get_sitedir);" \
+ -i gramps.sh.in || die
+
+ einfo "Fix icon location"
+ sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die
+
+ python_fix_shebang .
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-mime-install \
+ PYTHON="${EROOT}"/usr/bin/python2
+}
diff --git a/app-misc/gramps/gramps-4.1.3.ebuild b/app-misc/gramps/gramps-4.1.3.ebuild
new file mode 100644
index 0000000..6e5670e
--- /dev/null
+++ b/app-misc/gramps/gramps-4.1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+#DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="http://www.gramps.org/"
+SRC_URI="mirror://sourceforge/gramps/Stable/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="geography +gexiv2 html +reports spell"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="
+ dev-python/bsddb3
+ >=dev-python/pygobject-3.2.2-r1:3[${PYTHON_USEDEP}]
+ dev-python/pyicu
+ gnome-base/librsvg:2
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/pango[introspection]
+ x11-misc/xdg-utils
+ geography? ( >=sci-geosciences/osm-gps-map-1.0 )
+ gexiv2? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+ html? ( net-libs/webkit-gtk:3[introspection]
+ reports? ( media-gfx/graphviz )
+ spell? (
+ dev-python/gtkspell-python
+ app-text/gtkspell[introspection]
+ )
+)"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+DOCS="RELEASE_NOTES FAQ AUTHORS TODO NEWS README ChangeLog"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-resourcepath.patch"
+# epatch "${FILESDIR}/${P}-python-doc-init.patch"
+# epatch "${FILESDIR}/${P}-print-guiplug-error.patch"
+ epatch "${FILESDIR}/${PN}-use_bsddb3.patch"
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
new file mode 100644
index 0000000..b278b4e
--- /dev/null
+++ b/dev-python/pyicu/Manifest
@@ -0,0 +1 @@
+DIST PyICU-1.9.2.tar.gz 175831 SHA256 9b580801eb17b09a5e0e8ef7d3b29170361ed505c5f954b723c1b48a1e502bb6 SHA512 1964464f5385dc8f65c4b88b63cd9f34ced1ae365562386708d92fc5c40090a40554578bd5e90d0a996ca6f012b3d2a8ab6e0fd07968e94a0dfe18894e8f08f4 WHIRLPOOL 53fbd86090626cf34048501f48e8b832bafbe98369e99ae6e1a2faf5b627dc744f6d9c7354060fa4e06cb0cc116f14c834bcf63aa624691d1ecb05f1d7014ef7
diff --git a/dev-python/pyicu/metadata.xml b/dev-python/pyicu/metadata.xml
new file mode 100644
index 0000000..575c9a5
--- /dev/null
+++ b/dev-python/pyicu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>jmbsvicetto@gentoo.org</email>
+ <name>Jorge Manuel B. S. Vicetto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyicu/pyicu-1.9.2.ebuild b/dev-python/pyicu/pyicu-1.9.2.ebuild
new file mode 100644
index 0000000..e742ec1
--- /dev/null
+++ b/dev-python/pyicu/pyicu-1.9.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+DISTUTILS_IN_SOURCE_BUILD=1 # setup.py applies 2to3 to tests
+
+inherit distutils-r1
+
+MY_PN="PyICU"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Python bindings for dev-libs/icu"
+HOMEPAGE="http://pyicu.osafoundation.org/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/icu"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/epydoc )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(CHANGES CREDITS README.md)
+
+python_compile_all() {
+ if use doc; then
+ einfo "Making documentation from ${EPYTHON} build"
+ cd "${BEST_BUILD_DIR}" || die
+ epydoc --html --verbose \
+ --url="${HOMEPAGE}" --name="${MY_P}" \
+ icu.py || die "Making the docs failed!"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ if use doc; then
+ dohtml -r ../*/html/*
+ fi
+}
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index df7a842..5c6ee1c 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -1 +1,3 @@
+DIST 1.0.1.tar.gz 75430 SHA256 3960172735c67f8e0cc7385b090eec0442966f1f819cefc59daab136c79a3b89 SHA512 c4f2b8ddc4b19c1d777ab22e60acc39eab805cf058d46b23d72b179ac55b42095f9a3f3a21f912c6f33feb1ef83d4f33aa96d987e595eca0e46f7f9a647ac169 WHIRLPOOL b97ed126710809b6a709302ed11a2d665ef7eafeef999c7dc7e80512aee51a853440109c4a7bfa02d8fd5e1a42ac25d748dffb9fc46af73d94fe8b6cde77037e
DIST osm-gps-map-0.7.3.tar.gz 419300 SHA256 5967db2e911fc81297c7c035ddfe1f225ee708398f1083d7f0d1f7630afcd1a8 SHA512 a6a45621bcf0e608a2be99e1b3892bdf28eca52e61fcb9f8cd0354017ba86dbdda27d5c6d5bec75cd248a0b330f0bb24ec04c65deab11454f11e840823902687 WHIRLPOOL 328ef9790972b9c23d4321e111d86d5a99a0ace1205c311bc7db03df837f5f7490ff602b7305f1aa9e3c6b6d966392b936638f615b6e4429add3673b6c2138b0
+DIST python-osmgpsmap-0.7.3.tar.gz 212270 SHA256 fcd0339a5922bdbbb9c934aa3c2fb9a2b8d04487d037e36cbf308dc83a02a9cf SHA512 2c46a0ad80b4ff1b9d841de49b82c0c3c7c3b51c3a9ee0c7033ae2467e36de7632f308f90720f0bb01f5c785531be6207681631b5fec9fc81f90e1e9157bffbd WHIRLPOOL 11a7f49650a387fcded20c89f7c72f06be4a7b037f85bad4bc4b69c86446ff82b4d6f7703a9405b5cfce266d9534fe16b0ae0ed5c6b6c0440cfca7194889c69f
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-fix-introspection.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-fix-introspection.patch
new file mode 100644
index 0000000..350876c
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-fix-introspection.patch
@@ -0,0 +1,10 @@
+--- src/Makefile.am 2011-03-19 10:08:23.000000000 +0300
++++ src/Makefile.am 2013-04-02 23:13:01.408952029 +0400
+@@ -86,6 +86,7 @@
+ OsmGpsMap_1_0_gir_CFLAGS = $(OSMGPSMAP_CFLAGS)
+ OsmGpsMap_1_0_gir_LIBS = libosmgpsmap.la
+ OsmGpsMap_1_0_gir_FILES = $(introspection_sources)
++OsmGpsMap_1_0_gir_SCANNERFLAGS = --identifier-prefix=OsmGps
+ INTROSPECTION_GIRS += OsmGpsMap-1.0.gir
+
+ girdir = $(datadir)/gir-1.0
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
index 06c519b..7b986d6 100644
--- a/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
@@ -1,43 +1,81 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild,v 1.7 2015/04/08 18:49:16 mgorny Exp $
-EAPI="4"
+EAPI=5
-inherit autotools gnome2
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
-DESCRIPTION="osm-gps-map is a gtk+ viewer for OpenStreetMap files."
+inherit eutils autotools gnome2 distutils-r1
+
+DESCRIPTION="A gtk+ viewer for OpenStreetMap files"
HOMEPAGE="http://nzjrs.github.com/osm-gps-map/"
-SRC_URI="http://www.johnstowers.co.nz/files/${PN}/${P}.tar.gz"
+SRC_URI="http://www.johnstowers.co.nz/files/${PN}/${P}.tar.gz
+python? ( http://www.johnstowers.co.nz/files/${PN}/python-osmgpsmap-${PV}.tar.gz )"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
-IUSE="introspection python"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-DEPEND="
- >=dev-libs/glib-2.16.0
- gnome-base/gnome-common
- >=net-libs/libsoup-2.4.0
+RDEPEND="
+ >=dev-libs/glib-2.16.0:2
+ >=net-libs/libsoup-2.4.0:2.4
>=x11-libs/cairo-1.6.0
- >=x11-libs/gtk+-2.14.0
+ >=x11-libs/gtk+-2.14.0:2[introspection?]
+ x11-libs/gdk-pixbuf:2[introspection?]
introspection? ( dev-libs/gobject-introspection )
+ python? ( ${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ )
"
-RDEPEND="${DEPEND}"
-PDEPEND="python? ( dev-python/python-osmgpsmap )"
-
-G2CONF="
- $(use_enable introspection)
- --docdir=/usr/share/doc/${PN}
- --disable-dependency-tracking
- --enable-fast-install
- --disable-static
-"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ gnome-base/gnome-common:3
+ virtual/pkgconfig"
+
+PYTHON_S="${WORKDIR}/python-osmgpsmap-${PV}"
+
+src_configure() {
+ # Configure script does not accept quoted EPREFIX...
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --docdir=/usr/share/doc/${PF} \
+ --enable-fast-install \
+ --disable-static
+}
src_prepare() {
- epatch "${FILESDIR}/${PN}-fix-docs-location.patch"
-# epatch "${FILESDIR}/${PN}-disable-compiler-warnings.patch"
+ epatch "${FILESDIR}/${P}-fix-docs-location.patch" \
+ "${FILESDIR}/${P}-fix-introspection.patch"
eautoreconf
gnome2_src_prepare
+
+ if use python ; then
+ cd "${PYTHON_S}" || die
+ epatch "${FILESDIR}/${P}-fix-python-setup.py.patch"
+ fi
+}
+
+src_compile() {
+ gnome2_src_compile
+
+ if use python ; then
+ cd "${PYTHON_S}" || die
+ CFLAGS="${CFLAGS} -I\"${S}\"/src" LDFLAGS="${LDFLAGS} -L\"${S}\"/src/.libs" distutils-r1_src_compile
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python ; then
+ cd "${PYTHON_S}" || die
+ distutils-r1_src_install
+ fi
}
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.0.1.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.0.1.ebuild
new file mode 100644
index 0000000..d800794
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.0.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild,v 1.7 2015/04/08 18:49:16 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit eutils autotools gnome2 distutils-r1
+
+AUTHOR="nzjrs"
+DESCRIPTION="A gtk+ viewer for OpenStreetMap files"
+HOMEPAGE="http://nzjrs.github.com/osm-gps-map/"
+SRC_URI="http://www.github.com/${AUTHOR}/${PN}/archive/${PV}.tar.gz"
+#python? ( http://www.johnstowers.co.nz/files/${PN}/python-osmgpsmap-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/glib-2.16.0:2
+ >=net-libs/libsoup-2.4.0:2.4
+ >=x11-libs/cairo-1.6.0
+ >=x11-libs/gtk+-2.14.0:2[introspection?]
+ x11-libs/gdk-pixbuf:2[introspection?]
+ introspection? ( dev-libs/gobject-introspection )
+ python? ( ${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ gnome-base/gnome-common:3
+ virtual/pkgconfig"
+
+PYTHON_S="${WORKDIR}/python"
+
+src_configure() {
+ # Configure script does not accept quoted EPREFIX...
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --docdir=/usr/share/doc/${PF} \
+ --enable-fast-install \
+ --disable-static
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-fix-docs-location.patch" \
+ "${FILESDIR}/${PN}-fix-introspection.patch"
+ eautoreconf
+
+ gnome2_src_prepare
+
+ if use python ; then
+ cd "${PYTHON_S}" || die
+ epatch "${FILESDIR}/${P}-fix-python-setup.py.patch"
+ fi
+}
+
+src_compile() {
+ gnome2_src_compile
+
+ if use python ; then
+ cd "${PYTHON_S}" || die
+ CFLAGS="${CFLAGS} -I\"${S}\"/src" LDFLAGS="${LDFLAGS} -L\"${S}\"/src/.libs" distutils-r1_src_compile
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python ; then
+ cd "${PYTHON_S}" || die
+ distutils-r1_src_install
+ fi
+}
diff --git a/www-apps/dokuwiki/dokuwiki-20140505e.ebuild b/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
index 8a950c6..a311091 100644
--- a/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit webapp depend.php
+inherit webapp
# upstream uses dashes in the datestamp
MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
@@ -21,6 +21,7 @@ IUSE="gd"
DEPEND=""
RDEPEND="
>=dev-lang/php-5.3[xml]
+ virtual/httpd-php:*
gd? ( ||
(
dev-lang/php[gd]
@@ -30,7 +31,6 @@ RDEPEND="
"
need_httpd_cgi
-need_php_httpd
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/www-apps/dokuwiki/dokuwiki-20140929d.ebuild b/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
index 29c8522..a311091 100644
--- a/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
@@ -4,13 +4,13 @@
EAPI=5
-inherit webapp depend.php
+inherit webapp
# upstream uses dashes in the datestamp
MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
MY_PV="${MY_BASE_PV}${PV:8:1}"
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
+DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs"
HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
@@ -21,6 +21,7 @@ IUSE="gd"
DEPEND=""
RDEPEND="
>=dev-lang/php-5.3[xml]
+ virtual/httpd-php:*
gd? ( ||
(
dev-lang/php[gd]
@@ -30,7 +31,6 @@ RDEPEND="
"
need_httpd_cgi
-need_php_httpd
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-07-01 17:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-01 17:24 [gentoo-commits] dev/jmbsvicetto:master commit in: dev-python/pyicu/, www-apps/dokuwiki/, sci-geosciences/osm-gps-map/files/, Jorge Manuel B. S. Vicetto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox