Fix introspection issue, add python bindings support, bug #373809. Thanks to Nikoli, EvaSDK and hasufell.

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

5 files changed, 91 insertions, 36 deletions

diff --git a/sci-geosciences/osm-gps-map/ChangeLog b/sci-geosciences/osm-gps-map/ChangeLog
index 803f0c1f1c3d..591390757234 100644
--- a/sci-geosciences/osm-gps-map/ChangeLog
+++ b/sci-geosciences/osm-gps-map/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/osm-gps-map
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/ChangeLog,v 1.1 2013/03/28 18:57:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/ChangeLog,v 1.2 2013/04/02 20:27:16 maksbotan Exp $
+
+  02 Apr 2013; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/osm-gps-map-0.7.3-fix-introspection.patch,
+  +files/osm-gps-map-0.7.3-fix-python-setup.py.patch, osm-gps-map-0.7.3.ebuild:
+  Fix introspection issue, add python bindings support, bug #373809. Thanks to
+  Nikoli, EvaSDK and hasufell.
 
 *osm-gps-map-0.7.3 (28 Mar 2013)
 
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
index 91e6478c921f..a0d934ddc004 100644
--- a/sci-geosciences/osm-gps-map/Manifest
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -1,20 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX osm-gps-map-0.7.3-disable-compiler-warnings.patch 398 SHA256 9f0858eec24f06217b20cad8132a347a32ba643ab65d275fdc79a585ca2d4200 SHA512 2af14a5592741b7336ba7a402f723ae0c9b500fc0873e3d475554c59477cc4fe4af5edcefd752060af952223506b465e67da9c7ecd59a7b42f29d0c854a5a885 WHIRLPOOL dd207b4fce7ab600ae4479b62b0078e21db9e2bf21bd9839511e03f7c6635ea8df58737cccc69dbe19233c8c3657bc1ec2b99110663bac80e40e9d87675634a4
 AUX osm-gps-map-0.7.3-fix-docs-location.patch 505 SHA256 0de28ae847e521da9b92f021761ec8c3e9de7c092b00e64e18c36cb4a908b2cd SHA512 48c3aae2881a28173336e46883234a5178184fe5f014506038ab7cfb422ad8f5e750148647430cc13427865539223909621ed599618e253c66d0f95e9cd6a5c2 WHIRLPOOL f7ceadd5c701b891185f4a949a27f00f65bde55e72827010eb5b380c361f5bff17e3479c2327f063c2819426b13434bf41c59cc67cc78dc32381faa69fa60286
+AUX osm-gps-map-0.7.3-fix-introspection.patch 405 SHA256 dfc9112c028f29ee6c5914479649c3b9db74bf66dfef49ca4c9269f532b761aa SHA512 066cd78ab4ea91d976e4379659f606844e468960a43176432ff0d30df159313cf0cdd4dca988dccfa9801427c32128e6ec73cc60d7cf26693a997c3942a5dc70 WHIRLPOOL d9d7e1b3c3d747faf9607a098d05ffb56e570bf932e74b5b7fb05be9e58b016a8f60cb044dd6ccb914c71898a58a80deea7af39246237bb3eac0c121a557dd8c
+AUX osm-gps-map-0.7.3-fix-python-setup.py.patch 715 SHA256 dbac7652fa11ccd3e8be8aa5e9822e08f9005abb7f3e7097852f607448ec79bb SHA512 d88aeb9e986d5fe547035f35b17e6f4dd117862a85581a839cb6b602c4fdf9c957c7c18a54a1ece015c85036cb0941e952d773f23b8f487755b37100c0f82185 WHIRLPOOL d947ba51cfdc80d975b61bfa2e1a1d729df324622014c0edb2e3f87085c984a81ef96d10434dc9d1503e506f06205f94bd6039244f5b003abd82122146a8ed07
 DIST osm-gps-map-0.7.3.tar.gz 419300 SHA256 5967db2e911fc81297c7c035ddfe1f225ee708398f1083d7f0d1f7630afcd1a8 SHA512 a6a45621bcf0e608a2be99e1b3892bdf28eca52e61fcb9f8cd0354017ba86dbdda27d5c6d5bec75cd248a0b330f0bb24ec04c65deab11454f11e840823902687 WHIRLPOOL 328ef9790972b9c23d4321e111d86d5a99a0ace1205c311bc7db03df837f5f7490ff602b7305f1aa9e3c6b6d966392b936638f615b6e4429add3673b6c2138b0
-EBUILD osm-gps-map-0.7.3.ebuild 1020 SHA256 d667ff5661cbfd5dacfce6671bbeb6b6695a6ba1c444248b8f3c5d0e3f368ed8 SHA512 26255dc090ed2d38607afd757123dba254841419224ffedcd1db28df656d0e758238c8faae9a9406e6e69e8f2ddaf7b5e45dfef5a12aae22253d6eb653cf1724 WHIRLPOOL 62ac9499dc1d1b526cab744a7fbbf57e2190b335c958167e794f02e787ad723643203b4cefa0881613e870639afde1eefcd69647fb062ba34ebf3baa490cf7fc
-MISC ChangeLog 651 SHA256 5e78ab6061ef70716ea2afd7c95d65a0bfc0db5d4fe1c21719fc0f6f2efa9b0c SHA512 d450aca63fbea3e43854ee89a1eaa352300747aa77c6fb2ddd7e08b59984bafc68ffd6db0b64d28c6f739e8671b46e6adb26b4d603a09419b4176ce48e755ead WHIRLPOOL ccf44941176c98e7f760618e2387b6237b871596beef4993fa9de7d02e532e10439ad8c60994377037c4f621d6f7b372c697406279ff1b4f3018418bfb4ad32b
+DIST python-osmgpsmap-0.7.3.tar.gz 212270 SHA256 fcd0339a5922bdbbb9c934aa3c2fb9a2b8d04487d037e36cbf308dc83a02a9cf SHA512 2c46a0ad80b4ff1b9d841de49b82c0c3c7c3b51c3a9ee0c7033ae2467e36de7632f308f90720f0bb01f5c785531be6207681631b5fec9fc81f90e1e9157bffbd WHIRLPOOL 11a7f49650a387fcded20c89f7c72f06be4a7b037f85bad4bc4b69c86446ff82b4d6f7703a9405b5cfce266d9534fe16b0ae0ed5c6b6c0440cfca7194889c69f
+EBUILD osm-gps-map-0.7.3.ebuild 1798 SHA256 dc81e9ca368417eb3f94dd184556758cca4b2f990bd3735b690c13e1074dd986 SHA512 dbf332fb34339b95b79d612ae76748c4db90bf66ab1b67bef23ff0a79978609de964ed8b5d8b3702ed33373ec1f71240859b6aeb7b981faca0da968eb1dc5191 WHIRLPOOL f96426cb08a5bf261f8ee8f34f0762d7c7d5b03578423656dcd07747512738da821f1f8bb42a922aca169efd88042886270d150ea080c1ac370810aca3c6ee20
+MISC ChangeLog 949 SHA256 46100b7157bc3c17aad71f6e3a0b60616c9234968731a462b8452e92f60c1b32 SHA512 d6225273fad3d59079dba6e8cd0efe4ea5182ee1938fa6e904c68997fbd6acabef9ead02ba0dc9c990696f22cc59916c1b55d021c2ab3ead77ddabdbaa9df67e WHIRLPOOL 66d6c008ff0799e48c4139e174d5e333bb1196933e467dfc64e722d85ada647687a3c0b5ee2f062c27923fceee17edfac3d972ae2dba392dc4666b1eeb250096
 MISC metadata.xml 591 SHA256 b2d6616fdcd4184d69b537a48d9af3690f6d2b0483467d071c7c08c5dc494a1c SHA512 f19e278d7b71bae0f915c82d7d60263ad00f6ef2f978f0a5aae2377faab70290a987106832114b00c861368a877a5d91fae673a64cac587de39c0a2ef9ba2e59 WHIRLPOOL 7f4934af2b99bf26614b13f2e02f7677195c4ec68bd559dce94755c0a13b03a2542a81835b5aed26b422d9c6299cf08b5c2cc13d830c2875960ae44a86201e80
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJRVJKWAAoJEJWyH81tNOV9qioH/2p7sQ5vioKzRE0ix17y6i22
-z3AytlMrAAtXT5YUGy2MqfuH+tybmQRAQ3cWFd6A+WEZmx77xw/G5NyqUcX6h5ee
-WMzXV7biXC1xIt4if0g9Kllpf0MSkjkptG2RZ85TCPaavORgRtn2QKGMpcqNaC8n
-eZeGkC6H/J/i0B9Kn3FsD17838H5txTviOpUTW5sktEm4TnC+89F8b6a+2lKD6mZ
-4FYZdI8kuNMVwDgiwtDuRHTUFwXSNVgS75IrN/c23poNHEA/dWUuEEcItDyXqK78
-2urNuCOM1BYrKRoiYGqlkitMaePraw6tg0PKTAUR8hX6l9O36nhWIlOYfjTHPcI=
-=Iv7z
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-introspection.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-introspection.patch
new file mode 100644
index 000000000000..350876ce40bb
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-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/files/osm-gps-map-0.7.3-fix-python-setup.py.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-python-setup.py.patch
new file mode 100644
index 000000000000..f6287bfc1135
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-python-setup.py.patch
@@ -0,0 +1,15 @@
+--- setup.py	2011-03-19 10:08:23.000000000 +0300
++++ setup.py	2013-04-02 23:35:01.469947224 +0400
+@@ -21,9 +21,9 @@
+ 
+ _osmgpsmap = Extension(name = 'osmgpsmap',
+             sources= ['osmgpsmapmodule.c','osmgpsmap.c'],
+-            include_dirs = get_include('osmgpsmap pygobject-2.0'),
+-            library_dirs = get_lib_dirs('osmgpsmap pygobject-2.0'),
+-            libraries = get_libs('osmgpsmap pygobject-2.0'),
++            include_dirs = get_include('gtk+-2.0 pygobject-2.0'),
++            library_dirs = get_lib_dirs('gtk+-2.0 pygobject-2.0'),
++            libraries = get_libs('gtk+-2.0 pygobject-2.0') + ["osmgpsmap"],
+             define_macros = [('VERSION', '"""%s"""' % VERSION)],
+             )
+ 
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 6cb769cfd9f6..7964f21eade6 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,42 +1,77 @@
 # Copyright 1999-2013 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.1 2013/03/28 18:57:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild,v 1.2 2013/04/02 20:27:16 maksbotan Exp $
 
-EAPI="5"
+EAPI=5
 
-inherit autotools gnome2
+PYTHON_COMPAT=( python2_{6,7} )
+DISTUTILS_OPTIONAL=1
 
-DESCRIPTION="A gtk+ viewer for OpenStreetMap files."
+inherit autotools gnome2 distutils-r1
+
+DESCRIPTION="A gtk+ viewer for OpenStreetMap files"
 HOMEPAGE="http://nzjrs.github.com/${PN}/"
-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 ~x86"
 IUSE="introspection python"
 
-DEPEND="
+RDEPEND="
 	>=dev-libs/glib-2.16.0
-	gnome-base/gnome-common
 	>=net-libs/libsoup-2.4.0
 	>=x11-libs/cairo-1.6.0
-	>=x11-libs/gtk+-2.14.0
+	>=x11-libs/gtk+-2.14.0:2
+	x11-libs/gdk-pixbuf
 	introspection? ( dev-libs/gobject-introspection )
+	python? ( ${PYTHON_DEPS}
+		dev-python/pygtk[${PYTHON_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+	)
 "
-RDEPEND="${DEPEND}"
-
-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"
+
+PYTHON_S="${WORKDIR}/python-osmgpsmap-${PV}"
+
+pkg_setup() {
+	#configure script does not accept quoted EPREFIX...
+	G2CONF="
+		$(use_enable introspection)
+		--docdir=/usr/share/doc/${PF}
+		--enable-fast-install
+		--disable-static
+	"
+}
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-docs-location.patch"
-#	epatch "${FILESDIR}/${P}-disable-compiler-warnings.patch"
+	epatch "${FILESDIR}/${P}-fix-docs-location.patch" \
+	       "${FILESDIR}/${P}-fix-introspection.patch"
 	eautoreconf
 
 	gnome2_src_prepare
+
+	cd "${PYTHON_S}" || die
+	epatch "${FILESDIR}/${P}-fix-python-setup.py.patch"
+}
+
+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
 }