diff options
| author | Andreas K. Huettel <andreas.huettel@physik.uni-r.de> | 2011-11-03 18:10:17 +0100 |
|---|---|---|
| committer | Andreas K. Huettel <andreas.huettel@physik.uni-r.de> | 2011-11-03 18:10:17 +0100 |
| commit | b782d52008d0096712edc86497ce04693d774e12 (patch) | |
| tree | 26d380518ce5af473372ed98ce1f457a15c497b8 | |
| parent | e7d3496677b69460844d60811ac4afe4dd3d2ae6 (diff) | |
| download | kde-b782d52008d0096712edc86497ce04693d774e12.tar.gz kde-b782d52008d0096712edc86497ce04693d774e12.tar.bz2 kde-b782d52008d0096712edc86497ce04693d774e12.zip | |
[kde-base/marble] Dont try to install non-existing FindMarbleWidget.cmake
(Portage version: 2.1.10.32/git/Linux x86_64, signed Manifest commit with key 7887F787)
| -rw-r--r-- | kde-base/marble/Manifest | 24 | ||||
| -rw-r--r-- | kde-base/marble/marble-4.7.49.9999.ebuild | 10 | ||||
| -rw-r--r-- | kde-base/marble/marble-9999.ebuild | 10 |
3 files changed, 31 insertions, 13 deletions
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest index f7d630b5aa0..3cf3eb07c5f 100644 --- a/kde-base/marble/Manifest +++ b/kde-base/marble/Manifest @@ -1,6 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX marble-4.6.2-magic.patch 828 RMD160 1522e8dbeda1a17d19e7e78b8093424b93ee7b0c SHA1 f0c8bcc01a3381e99191d958b728e660b63caf9d SHA256 25d4c077da9218ca6f8400a803553203df596cdace0eee1eaf5ec56e6604e174 AUX marble-4.7-magic-r1.patch 1801 RMD160 27e157f23903d7ce070682abffd534159eb8e3f1 SHA1 04264060be347156ed0d1d4555de84612b54f702 SHA256 9d5a32d90f0a00492ef53ff523abfb25729f1d23d0ce213be6e6fa96edb31cbe AUX marble-4.7-magic.patch 997 RMD160 7b8229a0d6496c9452fce4185dde4050734c1152 SHA1 03fba22202648b73a013226eff70de5a158303eb SHA256 6e9b37be7cf5088eb812617f239e0948f0472a3d5bc47ddac7cc93a2f2ef6047 -EBUILD marble-4.7.49.9999.ebuild 1726 RMD160 265f80ab8dae66f3bd44ba4adedcc9f9fbea146a SHA1 9067e66fe438b4eb2f547ce996587638e9344ad8 SHA256 7ed2bbccc647f59c480d1641586d4b6287087ed089f57869607f5d1c65f0d059 -EBUILD marble-9999.ebuild 1396 RMD160 13173ed2e57710cb5d82c3e2d82b0b2c57c9ad9a SHA1 8564e3749de9b08a17dc7f345f15d996a015cf8a SHA256 93478bada37d11733118a775cc8e8de41b75f2a779e8dff08c2ea18e82abe307 +EBUILD marble-4.7.49.9999.ebuild 1564 RMD160 66f1845e3461a3fcf80fdb6641e8e28919d4dd63 SHA1 07b62c11b52cf818518c9e3926ed75306ea2bc33 SHA256 e9416117c8fc17ab15896676d2ffb131df4a57c89450b8768c0489a55808bdf6 +EBUILD marble-9999.ebuild 1564 RMD160 66f1845e3461a3fcf80fdb6641e8e28919d4dd63 SHA1 07b62c11b52cf818518c9e3926ed75306ea2bc33 SHA256 e9416117c8fc17ab15896676d2ffb131df4a57c89450b8768c0489a55808bdf6 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBCgAGBQJOssr5AAoJEEb+UGWnxTyHp4YP/32C8FiFTp/L9PcnPGJSOPPW +zcS4d2z12CVcwrZ8pPvyBisqI/R981A+zIkxHVKi48o+Jm1rguwJDGfVn5/QnQa/ +flqNa4vhuxb1ncjOYDIEKjnhL8RcRUTfT4zvpovm5OGx9fT8k/DMP1p5Zx6m9UST +RU8P0FXx14EGWnSHzhrbSBaU7nOay9/lit/yH747ghZRUIJtgiQ3H0N8/JF9jx47 +oHI8Hj4jrcaLA1Kn8GG3VE5mTa3TYosgfUArpZMlStwYbg/NBcVSi9SB47fdqUQF +c4Wx2B8N+oPSjWTC37u2h05iXWiPhQVPa3uAHGvMTOTMGYAIpjsNeCynLVM/xhyc +16eLFyY0386Fuhr6bgWOtIUwasfB5+iwusNzlcIj/pBY92hs00CJSvTr6lTHUAVf +XK8OKfKGw/WFcb6y/CAn96V5H8IJM4KXVZX8d5DwnQZzYMOQWfx2Sy3wrDCAr8JU +4isax+1QWwMxcvURxG8Vxu5M2SIZXZfGwuDpIS5Fi9Ej43ODcGAkq4OV3Tl6WQoa +J3J8UqOgg+Aorpi1MhsuAcUDMKD/MJDWXyJdglVYpOplFSK2Olk3RmbT76Upy/zL +5RzHYo0zynhhTZSSqIYfVx/czX96x7YvPsDR4mZR8FRtcK2X/M/BawYKTm+TPRIb +oMq6GXMZtSfX9WAm0pD8 +=Aph5 +-----END PGP SIGNATURE----- diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild index bf31559e108..e66e234884d 100644 --- a/kde-base/marble/marble-4.7.49.9999.ebuild +++ b/kde-base/marble/marble-4.7.49.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v 1.2 2011/11/03 10:52:25 tampakrap Exp $ EAPI=4 @@ -63,11 +63,3 @@ src_configure() { kde4-base_src_configure } - -src_install() { - if use plasma; then - insinto /usr/share/apps/cmake/modules - doins "${S}"/cmake/modules/FindMarbleWidget.cmake - fi - kde4-base_src_install -} diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild index b4f1435799c..e66e234884d 100644 --- a/kde-base/marble/marble-9999.ebuild +++ b/kde-base/marble/marble-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v 1.2 2011/11/03 10:52:25 tampakrap Exp $ EAPI=4 @@ -30,6 +30,10 @@ RDEPEND="${DEPEND} REQUIRED_USE="plasma? ( kde )" +PATCHES=( + "${FILESDIR}/${PN}-4.7-magic-r1.patch" +) + pkg_setup() { python_set_active_version 2 kde4-base_pkg_setup @@ -39,10 +43,12 @@ pkg_setup() { src_prepare() { kde4-base_src_prepare python_convert_shebangs -r $(python_get_version) . + + find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </' } src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN) $(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS) $(cmake-utils_use_with python PyQt4) |