diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-05-20 13:59:15 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-05-20 13:59:15 +0000 |
| commit | e82e405e3e7d87d114acec4cefbcf56af366cc7e (patch) | |
| tree | 7b067490088d2e712ef86e29b744a66340c21047 /sci-geosciences | |
| parent | fix dependencies wrt #470748 (diff) | |
| download | historical-e82e405e3e7d87d114acec4cefbcf56af366cc7e.tar.gz historical-e82e405e3e7d87d114acec4cefbcf56af366cc7e.tar.bz2 historical-e82e405e3e7d87d114acec4cefbcf56af366cc7e.zip | |
Added missing python USE flag conditional in prepare phase, fixes compilation with USE=-python.
Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/osm-gps-map/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/osm-gps-map/Manifest | 18 | ||||
| -rw-r--r-- | sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild | 14 |
3 files changed, 22 insertions, 16 deletions
diff --git a/sci-geosciences/osm-gps-map/ChangeLog b/sci-geosciences/osm-gps-map/ChangeLog index c7f947b34481..ad9c6aab9030 100644 --- a/sci-geosciences/osm-gps-map/ChangeLog +++ b/sci-geosciences/osm-gps-map/ChangeLog @@ -1,6 +1,10 @@ # 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.4 2013/04/21 14:14:32 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/ChangeLog,v 1.5 2013/05/20 13:59:01 tomwij Exp $ + + 20 May 2013; Tom Wijsman <TomWij@gentoo.org> osm-gps-map-0.7.3.ebuild: + Added missing python USE flag conditional in prepare phase, fixes compilation + with USE=-python. 21 Apr 2013; Tom Wijsman <TomWij@gentoo.org> osm-gps-map-0.7.3.ebuild: Slotted dependencies to avoid breakage, fixes bug #464240. diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest index cdbeb667a490..9b126da574b2 100644 --- a/sci-geosciences/osm-gps-map/Manifest +++ b/sci-geosciences/osm-gps-map/Manifest @@ -7,17 +7,17 @@ AUX osm-gps-map-0.7.3-fix-introspection.patch 405 SHA256 dfc9112c028f29ee6c59144 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 DIST python-osmgpsmap-0.7.3.tar.gz 212270 SHA256 fcd0339a5922bdbbb9c934aa3c2fb9a2b8d04487d037e36cbf308dc83a02a9cf SHA512 2c46a0ad80b4ff1b9d841de49b82c0c3c7c3b51c3a9ee0c7033ae2467e36de7632f308f90720f0bb01f5c785531be6207681631b5fec9fc81f90e1e9157bffbd WHIRLPOOL 11a7f49650a387fcded20c89f7c72f06be4a7b037f85bad4bc4b69c86446ff82b4d6f7703a9405b5cfce266d9534fe16b0ae0ed5c6b6c0440cfca7194889c69f -EBUILD osm-gps-map-0.7.3.ebuild 1893 SHA256 ca2e8d68a2535b0097194050f10be3fd8ea6038a9cdd352afe022700a30bb1f2 SHA512 a07d231b4fd91d726611c83da4652938bc32bc36f55093c55a0dc2ebc268baa4d10c7da5700a9fd815d44e1bf0ef0ee51fa045961baee17e006f68308c1bb6b8 WHIRLPOOL 5483a0de3984e9b2a4589b3cd5e53c92971646161a8fc53d2a5dfcebd4ce32e7fdc4c7c9e7e4d0c8c59789921f0c75485a343bfb6928d85ad428779a6abfc847 -MISC ChangeLog 1314 SHA256 b7f79415c0341d9ed5f625ce2dc56aff4190962e625e23c7f3e8acbe5ec05775 SHA512 210b972d5b772a32f3a288e61b53b19ca62f4dda16a9f805f7874de856bca4516d144ad1a71e7cbefb14172c6b71249f9a393196edf5974a42db36c90eea328d WHIRLPOOL 3da48d873ae7165ed71263f9a38f5ad5f993b59c703ba0e4fdc43ce9bda0f1a9b757b34dd2a814229e6cf8cd48a68d3da4bd49cf73e21fb67d269db62047a8c6 +EBUILD osm-gps-map-0.7.3.ebuild 1924 SHA256 1a9f38358ef4d63990433138b95e478cfd90f7e985fe0b9a3e5ac3685b3cc59e SHA512 741baa9546bb888f8b54fcf8d54a52bcbcf9f91c37756b15ec75f8071ea80bb52df850526f7b1a1c7c3a3892621b723a5cdd991d06815a685c5416745021d346 WHIRLPOOL 57dc425b915809bf3d83b2d22bf78006833364c814f2e38e7bd9416a9700000a93c2d3f4bc387120722f71ec662027a7be791bb546b2689c38d053a6571a5746 +MISC ChangeLog 1488 SHA256 cf749e9389ca8406b42acf74d13043d8fa0179aadd870e0ee58ef5393b0f9da7 SHA512 c96d704e1e1086598c4633b5aed29d2ca59c56cc8dfb93d5dd966390d6f91e72e108e7fa3b7099245c2c89527f564939d5b6748a6f6d989da74b8f25e38d1a6a WHIRLPOOL 70303bcf2d21f182b1307f7916904692da20e86496fbb7bc1dc6cd81c2a5e70aadd8179a8d1f97425dd04a9a9a9c7ea5ca89c9d2b2030dec5ba0544e74375829 MISC metadata.xml 591 SHA256 b2d6616fdcd4184d69b537a48d9af3690f6d2b0483467d071c7c08c5dc494a1c SHA512 f19e278d7b71bae0f915c82d7d60263ad00f6ef2f978f0a5aae2377faab70290a987106832114b00c861368a877a5d91fae673a64cac587de39c0a2ef9ba2e59 WHIRLPOOL 7f4934af2b99bf26614b13f2e02f7677195c4ec68bd559dce94755c0a13b03a2542a81835b5aed26b422d9c6299cf08b5c2cc13d830c2875960ae44a86201e80 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRc/QKAAoJEJWyH81tNOV9gbwIAL6if/QmSFZdaC4ExcuUv5u8 -raO9UmL1N8kRlfji3ca0akgP6z81IlfNJF7XZ8Sg6I/4HEGiLErvE396DbD39UZr -YA8/85spf4WsU6tzDhzaUlwPyD1YDm/fit+rnKuT6J3fEynKge8boXtcZohe7J8u -xc3N4M6C6CpMD4xOQSLw5/uLlCPXCFpa8UX+S7WYwoqa0wIAWI6HxHNNoPErHw40 -RWELv+CMuTmVfc1ZU5gqyM64fNy3RUR8wDSLgGxw3febaNN2zCxlOCIBxitB3IUD -xG1o0uN+RgdahzqsdSxyJSd3uAJAFiwaurqY2MEv7WiGxRo3FoKO7LiUzs1msMk= -=DevN +iQEcBAEBCAAGBQJRmiu9AAoJEJWyH81tNOV9nZAH/3dhsZxLoxPZMoMGNJbjh0fX +nw7u0qYEZhOoaW4NER8LYQhrPmxMMPdenmFQt4Xenq5O3ec0zJjOD+kz5aMfj2Y5 +8JfnXrY91+qNIP6oSjKSNG+wn68TNMdWGhLcivcmOR4EusQl/trLkW2W2pCO5VOq +/v9sjABLhM9U5N6UsgcGGaE6AxxdAMo8mkdYPR7Gb+8U03VBAZciqYL2lFT0lJ4i +BgC/YbfaINSVfSOKfzkQGIL4rYLfzJc9xQ6Z/xH3uYoPIlild+zecs7ISOfm1TXs +B2pgfAulALiljDjjAye0KO85kuEnAx/HXkat2XCl/4sa831HcZhQ3ZPAMeEhpzM= +=mJsN -----END PGP SIGNATURE----- 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 50ab856323c7..951b9f0f4804 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,6 +1,6 @@ # 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.4 2013/04/21 14:14:32 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild,v 1.5 2013/05/20 13:59:01 tomwij Exp $ EAPI=5 @@ -39,7 +39,7 @@ DEPEND="${RDEPEND} PYTHON_S="${WORKDIR}/python-osmgpsmap-${PV}" src_configure() { - #configure script does not accept quoted EPREFIX... + # Configure script does not accept quoted EPREFIX... gnome2_src_configure \ $(use_enable introspection) \ --docdir=/usr/share/doc/${PF} \ @@ -54,14 +54,16 @@ src_prepare() { gnome2_src_prepare - cd "${PYTHON_S}" || die - epatch "${FILESDIR}/${P}-fix-python-setup.py.patch" + 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 + if use python ; then cd "${PYTHON_S}" || die CFLAGS="${CFLAGS} -I\"${S}\"/src" LDFLAGS="${LDFLAGS} -L\"${S}\"/src/.libs" distutils-r1_src_compile fi @@ -70,7 +72,7 @@ src_compile() { src_install() { gnome2_src_install - if use python; then + if use python ; then cd "${PYTHON_S}" || die distutils-r1_src_install fi |