| 1 |
commit: b91adfba7b2953170ded2c99d7aa7b3c4896945d |
| 2 |
Author: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 3 20:32:55 2016 +0000 |
| 4 |
Commit: Markus Meier <maekke <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 3 20:32:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=b91adfba |
| 7 |
|
| 8 |
sci-geosciences/osm-gsm-map: install 0 and 1 versions into separate slots |
| 9 |
|
| 10 |
avoid conflicts in doc installation |
| 11 |
still pending is collision of /usr/share/gir-1.0/OsmGpsMap-1.0.gir and /usr/lib64/girepository-1.0/OsmGpsMap-1.0.typelib, not sure how to solve this properly |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.27 |
| 14 |
Manifest-Sign-Key: 0x363AF1F7765A9D02 |
| 15 |
|
| 16 |
sci-geosciences/osm-gps-map/Manifest | 32 +++++++++++----------- |
| 17 |
...ap-0.7.3.ebuild => osm-gps-map-0.7.3-r1.ebuild} | 6 ++-- |
| 18 |
.../osm-gps-map/osm-gps-map-1.0.2.ebuild | 7 +++-- |
| 19 |
3 files changed, 25 insertions(+), 20 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest |
| 22 |
index 3c3b811..4db946f 100644 |
| 23 |
--- a/sci-geosciences/osm-gps-map/Manifest |
| 24 |
+++ b/sci-geosciences/osm-gps-map/Manifest |
| 25 |
@@ -8,25 +8,25 @@ AUX osm-gps-map-0.7.3-fix-python-setup.py.patch 715 SHA256 dbac7652fa11ccd3e8be8 |
| 26 |
DIST osm-gps-map-0.7.3.tar.gz 419300 SHA256 5967db2e911fc81297c7c035ddfe1f225ee708398f1083d7f0d1f7630afcd1a8 SHA512 a6a45621bcf0e608a2be99e1b3892bdf28eca52e61fcb9f8cd0354017ba86dbdda27d5c6d5bec75cd248a0b330f0bb24ec04c65deab11454f11e840823902687 WHIRLPOOL 328ef9790972b9c23d4321e111d86d5a99a0ace1205c311bc7db03df837f5f7490ff602b7305f1aa9e3c6b6d966392b936638f615b6e4429add3673b6c2138b0 |
| 27 |
DIST osm-gps-map-1.0.2.tar.gz 431981 SHA256 7db73b83423bdc2168e89b3f1d2868af42b554de7fde02c4278fd2b006ac2a9f SHA512 afcbc968e48adb08fb3c38b7c6f2c27fc5e8d3b4253ca60f35d4bd3f673369f60f5e5701196bb4c522959eb2ea09ec97e8b76356c8ca833d0dd3584ecc8fdea1 WHIRLPOOL df5630cd4ea42b6cd604ab36b40068c741bb426429b354695e34666c77ac2a40407150356eb87e4ea3d7374ea5ad8e00bd05d4f63d2ccd6a5d2eb8991df22839 |
| 28 |
DIST python-osmgpsmap-0.7.3.tar.gz 212270 SHA256 fcd0339a5922bdbbb9c934aa3c2fb9a2b8d04487d037e36cbf308dc83a02a9cf SHA512 2c46a0ad80b4ff1b9d841de49b82c0c3c7c3b51c3a9ee0c7033ae2467e36de7632f308f90720f0bb01f5c785531be6207681631b5fec9fc81f90e1e9157bffbd WHIRLPOOL 11a7f49650a387fcded20c89f7c72f06be4a7b037f85bad4bc4b69c86446ff82b4d6f7703a9405b5cfce266d9534fe16b0ae0ed5c6b6c0440cfca7194889c69f |
| 29 |
-EBUILD osm-gps-map-0.7.3.ebuild 1852 SHA256 cb2eda79f5ab00f9592666870a50d3bdfa71a79211052180faaf52828ae57d76 SHA512 44f2ea4dd5fcdd692e11f4c7d466b2608989ca3c78376f1924dcebaaea3d3165d8e959da6684a246dd323ecda2ba2fb102fc29935c11fb874c55d564850d45c5 WHIRLPOOL 9eb837c2f48acae9751c0fdeeeb1a48f3650e531aebd77d8883cd0381c02ee26f3c30ebed0b97ee05a336cc9ca58fa6ab4a7f2436061d96420bec3a763db9b11 |
| 30 |
-EBUILD osm-gps-map-1.0.2.ebuild 971 SHA256 0f7d254c32920c11ae2d67402f116da75d78b8a6b722ceda6ae01c1a908c7305 SHA512 4532358194cafd268d5db160a621c4d35093b2d59f461c31c4f50073c6f76318e3e6ec9bfc4e9dc8ff31ccf1ff4a042a9793bc5e68ff0f2afaf9203e4f0c67b6 WHIRLPOOL fff6296c4c5b891c98f8b52652e4fa79861bebc1c629bb0da23bc9b191cc087176b1693f37621c5ad828e4e4ae02eeb0dd001d149f7fccdc6e8a4c1943426bcf |
| 31 |
+EBUILD osm-gps-map-0.7.3-r1.ebuild 1947 SHA256 cfa3fc3f955c5b43d4e474fba4f5775b7519c215d19f9389caf36b96f0f45451 SHA512 8fb28675ea45f973c9e94ce7ff6074c438344911749754062b9953f892f8ff5305744b361101ed4ff44b1ba7c8543017a76471c323dfbd096056d639327744b4 WHIRLPOOL 3358de40de7e1a0b0bb151b2919fdd381bf7f7a84bd662f6632d19cf8171ebe0a204d815e1b43c771af953c8cee55acc02a88af9f9d0796b86aab79600fd63bc |
| 32 |
+EBUILD osm-gps-map-1.0.2.ebuild 1109 SHA256 0b772ded886ab0b9d2d79628d84c5b4c2bebc4d4fda749ea4a5c36793f412f59 SHA512 db42f75959e106cce9511684abb8516d07b60b3067969d2dcad4dae988496075318dc87367635dd51ec88ab644a0dc1733f46582f7247b8fbb67b4bd12d4ddde WHIRLPOOL 9af19de84bd97ac5bc659cde41c29f62851c899d6dd24db37aae14de00c2f0068969c9bc873929d2366aadb4fa472b1889586ccfc179e567f7c5d82fc7f21c6c |
| 33 |
MISC metadata.xml 329 SHA256 4089fd65b95cd058ba948769047ef65c81498fad3b699e90a582dfc82d797ee7 SHA512 596756fc41694ba8c0159c45e397cca149a4f5fa28d7ad11799949a531d0a0f67e00398411cbb78b03455b24722440d9c3ef96487f0dfe37665ec8b24db313ba WHIRLPOOL 2a91ffb06c283a5d64e0690043d0a88888e10099a51357ada2565b93b52102cbabf044c9321d604b8fb2c6d915338b76bc7a76e3f35ed82a53d3e9bd58f4ba87 |
| 34 |
-----BEGIN PGP SIGNATURE----- |
| 35 |
Version: GnuPG v2.1 |
| 36 |
|
| 37 |
-iQJ8BAEBCABmBQJWduP1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
| 38 |
+iQJ8BAEBCABmBQJW2J9oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
| 39 |
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3 |
| 40 |
-QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8mqQP/jJjFEJIR6XIm1+nXshY++m4 |
| 41 |
-4QzHQadN0+zHNtlKAIe61E9kRRMeshnH0gtbP8CXbEJ7CzZ/RCmoS+/3sVbPBfAB |
| 42 |
-XlXxyGnFB/DOTuH7ZceOUy23pUMO1D/q6Lf8z35j5gtlk32uwgefyOE1QRJwcbge |
| 43 |
-UMR6OQc+4nrzt7LloyczhLLv7xkF5/cdQ7L0gIVfj1/BlxiBOqzntC5DdDXA/z0E |
| 44 |
-Ore6gREonGb1j5rdy5rcs39scTYwcVIH/ZI7CYMIfbkRvdvRG7y04STLEEiPb4LI |
| 45 |
-/ffamT6RVkKUBJJHw5ApNNXwibcdY0p4V1JFc8xEgesp7vjjJ7WJ6rFmEJpDGiNz |
| 46 |
-uSxhW6n003iC8T2vJMC3Ua9YxTJJNadjBHo+v2zRqWmVZZxLg9XXWjgtH4RUY1cz |
| 47 |
-iqRYxiPLtjUyVC+73HUipzPuJROmVqprK1K7z93ngQQTiG335NcXH66kDEQ0makb |
| 48 |
-/LomeyiZLklURfDBirSqldjhZo9fVwWXp5sKASARg2eMrASlAsjvlGvGHfpFDrRY |
| 49 |
-rIldjf6oiPtMtKQ6vnoBIJqv5Uw/9g7jN5EBOpUzbX5aYSatktaezPJcNLqwJLAl |
| 50 |
-mZvuue7OJc1XC7/b3xYORr9Y8rlm9XKlBjGsxRVvKJCziq3f6Saa6i5JS+AW5c2r |
| 51 |
-Wk/LvcU30eSOFuqT5GO/ |
| 52 |
-=3uvM |
| 53 |
+QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8hFsP/Rnj/4HcGrIu1I1rAUpqHYqm |
| 54 |
+Q3vlv5JQx9QnbqkGJeCIYKyo9fubBUXZrSYpjpU70IEG9mHvnK+STXpXeL1ttNVU |
| 55 |
+MneDUxI005tclR/Z3UkmcV5ClOHcT5SoByx4gzJ19Ou/tD2LK5zxzRdTGraTyIWW |
| 56 |
+kiDlb1bOd4ht5VsDb6fZq/FIvs4otXjPeZCDKOmnyf9URV0F93eN3mO0z0G/bS9W |
| 57 |
+L58e0sKCe+/vX0jIZlLzWCP3x5h7+/9z3cYMlJko+iGNiyLbW7EQmLD7tX8g7FD9 |
| 58 |
+sk8oBCEJW2/NE9RjI9YElBIfLeeR1Tf+YMZAY1W/iXgrPqdaMbYKkPcKhBDrz7/C |
| 59 |
+3hW73KUrXfkyBfnq2uHtvI4lcOBubaEYkW6kuXSCJBsqGhY/LBSr8k5pgHVibc++ |
| 60 |
+bKUm2vBSFWWpVW6ldo0IGjhnD2O/7PFXYXA+W0f3wSkvabYbmEeb50FIptZOiGq1 |
| 61 |
+yxZeHz6RdDLA6AU5qs4FIgZpO1EEGyHLgxRow2J45Swc8ISv6uyLo6i7zOvxlAjb |
| 62 |
++eW5r+bVvufmiEaVI9mEybWNk/sJs+0brWYo4Obf/cDcRazDZzc9NkiqmKOg9CAa |
| 63 |
+wF7rhu7/BvnLLI93+dkxHNtnjpPWtuiNV71Oa8sblD1lfeVSPjvogp2LuNfcfaVA |
| 64 |
+ybpb9raFi/NEN/OAc3kk |
| 65 |
+=DkGG |
| 66 |
-----END PGP SIGNATURE----- |
| 67 |
|
| 68 |
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-r1.ebuild |
| 69 |
similarity index 92% |
| 70 |
rename from sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild |
| 71 |
rename to sci-geosciences/osm-gps-map/osm-gps-map-0.7.3-r1.ebuild |
| 72 |
index 531bff5..f9317f2 100644 |
| 73 |
--- a/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild |
| 74 |
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3-r1.ebuild |
| 75 |
@@ -15,7 +15,7 @@ SRC_URI="http://www.johnstowers.co.nz/files/${PN}/${P}.tar.gz |
| 76 |
python? ( http://www.johnstowers.co.nz/files/${PN}/python-osmgpsmap-${PV}.tar.gz )" |
| 77 |
|
| 78 |
LICENSE="GPL-2" |
| 79 |
-SLOT="0" |
| 80 |
+SLOT="0/2.0.1" |
| 81 |
KEYWORDS="~amd64 ~x86" |
| 82 |
IUSE="+introspection python" |
| 83 |
|
| 84 |
@@ -51,7 +51,9 @@ src_configure() { |
| 85 |
|
| 86 |
src_prepare() { |
| 87 |
epatch "${FILESDIR}/${P}-fix-docs-location.patch" \ |
| 88 |
- "${FILESDIR}/${P}-fix-introspection.patch" |
| 89 |
+ "${FILESDIR}/${P}-fix-introspection.patch" |
| 90 |
+ sed -i -e "s/DOC_MODULE=libosmgpsmap/DOC_MODULE=${PF}/" \ |
| 91 |
+ docs/reference/Makefile.am || die |
| 92 |
eautoreconf |
| 93 |
|
| 94 |
gnome2_src_prepare |
| 95 |
|
| 96 |
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.0.2.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.0.2.ebuild |
| 97 |
index 46a617e..7c2f171 100644 |
| 98 |
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.0.2.ebuild |
| 99 |
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.0.2.ebuild |
| 100 |
@@ -11,7 +11,7 @@ HOMEPAGE="http://nzjrs.github.com/osm-gps-map/" |
| 101 |
SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz" |
| 102 |
|
| 103 |
LICENSE="GPL-2" |
| 104 |
-SLOT="0" |
| 105 |
+SLOT="1/0.0.0" |
| 106 |
KEYWORDS="~amd64 ~x86" |
| 107 |
IUSE="+introspection" |
| 108 |
|
| 109 |
@@ -26,10 +26,13 @@ RDEPEND=" |
| 110 |
DEPEND="${RDEPEND} |
| 111 |
dev-util/gtk-doc-am |
| 112 |
gnome-base/gnome-common:3 |
| 113 |
- virtual/pkgconfig" |
| 114 |
+ virtual/pkgconfig |
| 115 |
+ !<sci-geosciences/osm-gps-map-0.7.3" |
| 116 |
|
| 117 |
src_prepare() { |
| 118 |
epatch "${FILESDIR}/${PN}-0.7.3-fix-docs-location.patch" |
| 119 |
+ sed -i -e "s/DOC_MODULE=libosmgpsmap/DOC_MODULE=${PF}/" \ |
| 120 |
+ docs/reference/Makefile.am || die |
| 121 |
eautoreconf |
| 122 |
gnome2_src_prepare |
| 123 |
} |
Archives