Do not install libPropertyBrowser.a, bug 485678

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

6 files changed, 49 insertions, 22 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 2aa2cf064b9a..aefea0253f86 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.154 2013/09/06 19:50:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.155 2013/10/12 12:56:52 dilfridge Exp $
+
+  12 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  kipi-plugins-3.2.0.ebuild, kipi-plugins-3.3.0.ebuild,
+  kipi-plugins-3.4.0.ebuild, +files/kipi-plugins-3.4.0-staticar.patch:
+  Do not install libPropertyBrowser.a, bug 485678
 
 *kipi-plugins-3.4.0 (06 Sep 2013)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index afd11755bfb4..11a5c550f8fe 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA256
 
 AUX kipi-plugins-3.0.0-options.patch 1069 SHA256 064e9b865c21491eec7947cf0e12160866983f982243a4cc715efbf9116b172e SHA512 d58edfe3955e480e34c3ee64313c5ada15a664df7dc2369791f1bd5d7e05bc5f1666681d5b008a580de6cb00ff6c87d13dd1845ed0d7ad70a76e9888edce96cd WHIRLPOOL e59b098d5f8fcb2b487ae1dda07ed0cbc9cfa81095655eb120e985defa2aadb7e2bca6db015f1f1c6ef1645e2c8b1f329cb595c588ffc3f09c977b2cd69d856e
+AUX kipi-plugins-3.4.0-staticar.patch 877 SHA256 43e67c5da27331664c3ab3b97d8a481b4836ffd1498db55bee1bbac5489c9d5a SHA512 bd904c38b5acf4247707ea20e3c99ba602225969f1b9f006aa0f69f01ed8c127c4c1fe5183f1bf1bf71dd3fba36d6de787294a3b0de023520352066e10ab0047 WHIRLPOOL d9190cc44b6e1536806b42ecfe43edf6f9b6cbc980722a1407247d1fe2440db92e9831b61e1e089da0d5fa4867f204fff4d803aa8e064cf684b37053f377dbe1
 DIST digikam-3.2.0.tar.bz2 58449068 SHA256 bd7204d42c4ef73f22e757ba5daa334073bd02ccc054c31780786d2b1a2a481a SHA512 02a5bf61e63515f673ed4effa2e5c96a37d50d7847683c948156df5b5262c620bde17de1d09bc1baf2ed009d80585c66241dbf02c2bc2020ff12ab1cbcc7a669 WHIRLPOOL d07c93ce44a349da776060826cef76f9702c2c54889af2f4b8bf6461e9b579594c9e3cdd4c64bcf33880134ea23cd859468cc92eaf155ae5a209eeb23675f6e3
 DIST digikam-3.3.0.tar.bz2 67124485 SHA256 3dfe0e78171c8d65b3a8e603345400bf83b90241b7a24a8ae2f7fd3443b7ac11 SHA512 1044540fb7059586a1638a7076df4b740e3166651cdc692541d3023fc44d5719b0354bd9e13dfc18f38215e7849855c3a814dc65ce48a633a780409eef34d5ba WHIRLPOOL 37488c9cf97190d137977eadb47f54de934769af51caed145f446488880b37aebe9814e830275957a4f3a770ad799207594e5daf3240f91b1277847d5986e6a8
 DIST digikam-3.4.0.tar.bz2 67118904 SHA256 e7f28e46cfaecd21ec5f3b883a19e8d540685cbbab0a2b63d5cb12e07dff8095 SHA512 0b0e83a80e35517f03519b1721e45cd6ee4d127f2e30e02cca7b6e47c617815cb6ea5de2c85a848e5467de6cf654aeae1adb28574c78bd5df925b6590caf534c WHIRLPOOL b8fb3e0e63c93970f46b5131ccab662199f306ae2314fd91b807753aaeadc0eacbe47ef32fabad2772ae3858c29efb8464b089b85bea4fd57cdb16533958c257
-EBUILD kipi-plugins-3.2.0.ebuild 3625 SHA256 405a0f50714821c2f932a42592708883c099eec8df23c141873f1e08c8ebb8fc SHA512 4e030c6c7b9df78b9850645732a43eeedaaf6e42ac3fb1687900d2af6d37a8d9d6968050f73a4157afd7b6a5d62757366fe4d0bdb7e5391a499eb64d475bffd2 WHIRLPOOL ac3ca0aa6ad516c83b96f26234b0adaed0f666c783dd415e28e2f1ff8bbfce9609eb862d219063fc449b5c7fb79197e4b5ffb9b657fa7294c1c826ea659a63c8
-EBUILD kipi-plugins-3.3.0.ebuild 3633 SHA256 0d0ab329f5295ecc83c12cab7477c518d8c06ee2ab824ec4adba1cb1ebab4ec6 SHA512 a4d9753164ffcc2a9fb8c31b4ccc1f3ad59bd91e212f9bdb43fccdcc311e69dccffe6fbcbfcd12e0e8583acd94835fe1ce9cce7148a1a33187f56382aa2bdb64 WHIRLPOOL b09463d059bda538e19502b00bb7711b4de33969fadc5f5e74ba1969431cbb2f71499289442c6af22bdbe6f4dba2b0f23171d48863aee006e13aa034e8376907
-EBUILD kipi-plugins-3.4.0.ebuild 3633 SHA256 86b5a9afe09530ea2daa180d5a3dc2e1528f36db94ab90811c8f988db374f489 SHA512 f0bf83135773379ae990973930ba4fc836322191e32cccb20ec8d90d0c1fa61eb8a5854c21d9810cfed0e309d837b934890bba66961d97783153e538592e00f0 WHIRLPOOL ad66ea0bfb44de092248fbb0b0110236933e1ebab9992cb1273061096745c273b1a315376a262229dd9577ed22d29bf247b0636e7083421584dbe0af6eb257b5
-MISC ChangeLog 25388 SHA256 fe32cd21554c0e4cf0336379c8fac0a5b31537140ac11c8dce3c8ff197b43cda SHA512 89335e50957edd3be6f9ff46b90f7b39fb4d6a931a03c78fde8ca149d6b8d7fc95bdc46c2446b980fa27c73e0031a780c1f8b428e22da779d4c01fa37646f1dd WHIRLPOOL 5baa532e7356040412ca56e68e136ad1d4f225f87eeaee176a78dc55db4b71319cf37f9eddf26a6e4c8d84033dfc1312bd9c623ee5c0b41d133c3a6e94e2fdfa
+EBUILD kipi-plugins-3.2.0.ebuild 3673 SHA256 90e7b8d0132de4c395978aee6e695975e93f62d3e08bb425fd47337b121e6c3d SHA512 7704eef475f26d14699c4c515e7cf0bc4096f0c0b91f65def24660b875a244c19e5cf91ea335a99bbe3aec7017159f1844ff2235ae4941d12ded9105f27f5029 WHIRLPOOL b9d9a5fc8782316cd9e1bd0581e386b6ba1f23f1f18d497010e00194a6a0fad751e8897eb1c95115c0af2071f03adf8bc286f8209f4722ab2ac7b6f3005985d3
+EBUILD kipi-plugins-3.3.0.ebuild 3675 SHA256 78ca2b1b01febea62638ecfdfb7417377296e0c25955daa769dead9f5a0a5990 SHA512 4a242fa10af24e2e72eb3a0bd52d8c4848cbcf5e344a019b637ffa296d83f398a9044b54a78b42132bc4e5f7dd032af3ffdf1a630f74cf575aa0f317b7306595 WHIRLPOOL f97ea118b9553af6e1bf419e563b4002c0a112f63f3853e3ea0e512ca1d0abfcd949cd6a13ccf408f7e7f7cc149684f7f06a46354bf2cd67ea6af8162a15ac46
+EBUILD kipi-plugins-3.4.0.ebuild 3675 SHA256 640c4a8d4aad6eb3c315cc5cca8ccc8a24d6ff87176dabedb40b943ab14bff0e SHA512 a1e9522b87da7d3e332caf14d080731794a8601b95b9bd2766ca891f2a40d3459212f1d5fbbed31676aa071086e95f4ef3ec67276ba891774d2f89ea3553c01d WHIRLPOOL da6f0cb78f10083db7f7fbe6012ee2f2f2d9b0851049efab9cc4ac2b538e4a0f9842a97c8ca0e9db1cf29d524f0b03f3303da29f4679d781774f6fb9de0f438b
+MISC ChangeLog 25623 SHA256 72090e9de126c555f4eb1c7bc8d16287804dde7220384aa8e27c931cde9c7d3e SHA512 e0dc5eeea8f889214dc8c9e135ad3cd1b181c239b34ccae15c88f6759ddbfd4f71f97256eec1b26089d666ee80ebc7a25bc9e4ec9ea58cf0b131a6e3cf412550 WHIRLPOOL 6342b027f65e3ee78c8af67b8abd5c5068410644a7fa99a5ab27ba6aabc510926909c03ab74fdd48a5b493a691e27c71a7717b91bfc708ff38b1baea9b6f8925
 MISC metadata.xml 1026 SHA256 41d70f6a9f530a86c7091d047ddf0c5def042515235d22e2f86b9dd7aa1feaad SHA512 04429cb1cdea99211d8f5a911e9bb81fa5b13945f77f7ae6c29b526c9c7802ffb515e1ec606ec1dbc371dee9b2f8ab20a83c1a72da6f00e46de0cdc91cca2e07 WHIRLPOOL e196fb7e53afbff308d92349d87a33c7e14fb988df2e1aaaccd242a3f5c16e063253497812c0b7147ce3f28da6f164cdefc3152d687bf7ef747e2ee8bd184316
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSKjIbAAoJEJS/30SErRQvqVUP/3P53iLIrbL3dnsdcYkIt5Aj
-u2IXeQ4OcRl57NjsD8YnnZxZxwLx/3Y36OAnW2Vs3Qzzjostq6cJ+gR7pF48aTpT
-GpWoU6GLYyJml8k7kcayrtWfZZ1z4rW4i/iRCGcAh/5RD6H2pxyc+sJSdibgvx5n
-+2LSHPQ9Hh+81plrF16rMjQhRVI8kK8OBrcVJjeU1cyZKNUlgLAhxvE6fCpXQTsz
-rp93V7YPELWKq5JmS2EJmdzP1C5DdhZOomr1EeNWZphClnNWrS+aIvySbkWf6pqH
-QhvlZXjjJDB2ov2TVX8GL2TJvAsVn+QSEDgf9VWjCmKAwaPKcn+56lvW2pvASVkl
-PGzyzS/pbnP4no98Ek+lvk9qvDVl5qzcu1D1esQ5eTWqQMe7tqICGJBYhSlxlFBU
-blv1vztriDiJkxxDWsvj0T29ryfvTsizWElsAJXw2jESfU1bVamT4IqalT2hAS8J
-dzdxWgtxg0nzlwv2Xei0Qe0A96YLV/QsaOzlUORK01DdTzDzDPFIbGURRU/5YqaC
-Kblx5D7jmOVQEsGaqjOii8u8fkfYMPWd/P4jL4/4KHenEHmPtsfktgIh1pvUQ5fN
-ypib1VvkIwwahY8UktjX6vutVHAp4B/ZKlqTkMNyRCQ1qVQL2wxFLcUf3NHqQKcO
-ckHqSzJDFl09BGaqWoLl
-=qzp9
+iQIcBAEBCAAGBQJSWUdmAAoJEJS/30SErRQvF90P/i8L7bi+xxt5zB2t7YEkOLnV
+vGP+tg7betGW5zUDSOp+fsLxpyux736zPHX5qtDM5sOVXtqTyWBdXBO31Jkxh5eq
+xfjspnlIjTTgb5H4IOEvpB1Rnzt5nP5WAWOwpet9Ta0h4laYYmbzH7GBEXX+X5we
+hfOo8R4WuzeUsjS31bM7OjsXKhrKbOQe5dkm0JZBN8d1EQm+7l1vvYB4cpATziBU
+QkpY8mBCeO9cgRI94OGD4QiFlJTbrWxzDtSmHIRzSrYkZVV1h69jgXlyswZWw/jk
+0m8Fcd9HZ37dI9Jj2se7IQwjONVkgmuSfWcVN/s7DGck7aAxeSvn00GxbBj14Smp
+XaLo3mQchKAjDS51eU7bVFu2H8s8gRCy+ZZblhImLT5FgyuMvUHeyNNelwN8TbYe
+2ZeCWCJS4d0OQ6k4me61QnqJudPzzG1lYRm+Wqeeyze7Gf+/0pNW8vILHfbJE52U
+YsJuiaZwkYDtrgGDTsNnj/6iXi0gzU6h0Q8nmKGLktHiunF4RMsT1rEEApIoVRMy
+2z8RFcZTVo3hanOSqqxI47QJyWMUuV6DRFPkE45YKzL8ql7Obm/jG5st6e0FzXiA
+LDlCIYn1ZNP65EzUpPX0v3tb+PBndju1lHDJXJee8y0tcHG3foRj63m1tUTvuV1s
+YhadMcSO3xpbU6FXJsIo
+=pibD
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-3.4.0-staticar.patch b/media-plugins/kipi-plugins/files/kipi-plugins-3.4.0-staticar.patch
new file mode 100644
index 000000000000..7287de7a58b4
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-3.4.0-staticar.patch
@@ -0,0 +1,18 @@
+commit b9c0e87c74956196cf0d5042c8c13e9a381ba4e8
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date:   Thu Oct 10 16:11:18 2013 +0200
+
+    apply patch #82764 to not install libPropertiesBrowser
+    BUGS: 319664
+
+diff --git a/photolayoutseditor/extra/qtpropertybrowser/CMakeLists.txt b/photolayoutseditor/extra/qtpropertybrowser/CMakeLists.txt
+index 03cf1bd..46e158c 100644
+--- a/photolayoutseditor/extra/qtpropertybrowser/CMakeLists.txt
++++ b/photolayoutseditor/extra/qtpropertybrowser/CMakeLists.txt
+@@ -119,4 +119,5 @@ ADD_DEFINITIONS(${QT_DEFINITIONS})
+ ADD_DEFINITIONS(-DQT_DLL)
+ ADD_DEFINITIONS(-DQT_PLUGIN)
+ 
+-INSTALL( TARGETS PropertyBrowser ARCHIVE DESTINATION lib ${INSTALL_TARGETS_DEFAULT_ARGS} )
++# Do not install (yet), see https://bugs.kde.org/show_bug.cgi?id=319664
++# INSTALL( TARGETS PropertyBrowser ARCHIVE DESTINATION lib ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.2.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.2.0.ebuild
index 9ff945e64793..a0a4d80a3f6d 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.2.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.2.0.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/media-plugins/kipi-plugins/kipi-plugins-3.2.0.ebuild,v 1.4 2013/06/30 10:14:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.2.0.ebuild,v 1.5 2013/10/12 12:56:52 dilfridge Exp $
 
 EAPI=5
 
@@ -83,6 +83,7 @@ RESTRICT=test
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.0-options.patch"
+	"${FILESDIR}/${PN}-3.4.0-staticar.patch"
 )
 
 src_prepare() {
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.3.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.3.0.ebuild
index e85605ad7d14..62b99f407537 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.3.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.3.0.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/media-plugins/kipi-plugins/kipi-plugins-3.3.0.ebuild,v 1.1 2013/08/08 07:00:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.3.0.ebuild,v 1.2 2013/10/12 12:56:52 dilfridge Exp $
 
 EAPI=5
 
@@ -83,6 +83,7 @@ RESTRICT=test
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.0-options.patch"
+	"${FILESDIR}/${PN}-3.4.0-staticar.patch"
 )
 
 src_prepare() {
diff --git a/media-plugins/kipi-plugins/kipi-plugins-3.4.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-3.4.0.ebuild
index 041ef9bc0db7..7f3b1f45eeb6 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-3.4.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-3.4.0.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/media-plugins/kipi-plugins/kipi-plugins-3.4.0.ebuild,v 1.1 2013/09/06 19:50:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-3.4.0.ebuild,v 1.2 2013/10/12 12:56:52 dilfridge Exp $
 
 EAPI=5
 
@@ -83,6 +83,7 @@ RESTRICT=test
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.0-options.patch"
+	"${FILESDIR}/${PN}-3.4.0-staticar.patch"
 )
 
 src_prepare() {