[gentoo-commits] proj/android:master commit in: kde-base/kdelibs/files/, kde-base/kdelibs/ - gentoo-commits

From:	Benda XU <heroxbd@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/android:master commit in: kde-base/kdelibs/files/, kde-base/kdelibs/
Date:	Thu, 26 May 2016 04:05:23
Message-Id:	`1464097718.7afc276dba32b97d00e651cfb04550ff3c1410f8.heroxbd@gentoo`

1

commit:     7afc276dba32b97d00e651cfb04550ff3c1410f8

2

Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>

3

AuthorDate: Tue May 24 13:48:38 2016 +0000

4

Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>

5

CommitDate: Tue May 24 13:48:38 2016 +0000

6

URL:        https://gitweb.gentoo.org/proj/android.git/commit/?id=7afc276d

7

8

kde-base/kdelibs: FindQT4 prefix.

9

10

 kde-base/kdelibs/Manifest                          | 32 ++++++----------------

11

 .../kdelibs/files/kdelibs-4.14.13-FindQt4.patch    |  4 +--

12

 kde-base/kdelibs/kdelibs-4.14.16.ebuild            |  6 +++-

13

 3 files changed, 16 insertions(+), 26 deletions(-)

14

15

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest

16

index 70c0674..40caba1 100644

17

--- a/kde-base/kdelibs/Manifest

18

+++ b/kde-base/kdelibs/Manifest

19

@@ -1,35 +1,21 @@

20

------BEGIN PGP SIGNED MESSAGE-----

21

-Hash: SHA256

22

-

23

-AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 SHA512 e4d057665461dc27bda326178c8c21dbe75458a9cdc3cf976cf1e5b549d18732cd538c17fbad1f67b09188da0650e8d9c16d43076ffcfe06003484ddb442eb04 WHIRLPOOL f741e12a2a03a56a24ee734f6cf56d16d7621d708b87ea3be04e11b99cf24b9af53c88c4304c3b2d225e51c7403f8aacb1fcb152cc227bb5f98d6dea276250be

24

 AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341 SHA512 33a7eeb58b65ce28f0fadc1f6c7133e670391330d084df39990bb0a5b4ddd78f52375c1ebc620823adfe4eee22f10b85064d3fdcb6df0f63c5f6e757357e7ca7 WHIRLPOOL c585ed614ae27e0694156a7af68e222fe13578db95e611b592896475772572c316a05a60b39d1797d28f2c7bea52736ac41c5ee096a92e09e945c34f07ecf69c

25

-AUX kdelibs-4.8.1-norpath.patch 788 SHA256 813acf8e0b23eeac94d6f504ca53a3a5cc2fb8c33fa93b0398c99bb862a8cead SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89 WHIRLPOOL 9861fe4b4b61c6d659c31c102938f9b0377bfff90744a852f8d0251c6c66e1df29dacb4059610d9ec78e706ad36f66b3cb6179550de47270d759acb4004c46e8

26

-AUX kdelibs-4.14.5-mimetypes.patch 801 SHA256 4506dcac847d7fd407b249135c849dcd4992f56a06970a7c5985e9249554e69b SHA512 bd39c356fc88ad09c31c33fc91a35827846f30056a05e4ca6a5483e422709d28e887dbf1c5f9ce229331ee534553bf43ae88e9e51a6e5d759896ebe3e336c2e0 WHIRLPOOL 2c53dde672d2b417745ee63a5e2b91ebfd74dab5861e19d8236060ec0502094190af1cf3d2dc86efb7090dc637481d938b17d2254ec86ec9ff591d3b3dbdd5e0

27

-AUX kdelibs-4.4.90-xslt.patch 553 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea WHIRLPOOL 8fd53eb3a5bb083b12f1ff1e68f5ba9208a5badd0210944bf62297899a7416d61cbd29d24adc02024b70789bad289abafcfa24b02370e5ea5929b39022dc6f46

28

-AUX kdelibs-4.14.13-FindQt4.patch 1398 SHA256 6ed258c0c6cde178d78022d7f35ba61829021a925581e79b7c45afad51404ddc SHA512 59a88a05206526837d265417435c9e61d23367f608ca5bb142d4b9eaa74346687de7983d241e86c79fb6d4d6e19c2a24572b698f4b244849b8d348cf10c575f3 WHIRLPOOL ce4ceac81650284f0e3aaeba0bf63f3bb27ac7e31eabab1fdcd05d6c52c7d8ad0bd699beea21cf3ea8f11ae16d96e8a04ea7b8dbc8540003447c4e3befb70d69

29

-AUX kdelibs-4.14.15-revert.patch 1641 SHA256 02d0655afdfafc19894dc208ee8bec7e50e628015b1cf0ae9a735a7d7c4963bd SHA512 92a60ca8abed64cd0af40ce886e86d9451ae269b099a5f2e6b37cdeae6e20fe301cf99d16b5d2534d9c4b3a9d4fb0884d4f30d2db8c8f5820eaf7fbbbf40f586 WHIRLPOOL 5b3b456041dd524a801d66b2ca2419338282e6120a6db38c14cfe5a64eaf770f3aa16b174052c51caf59a57fbbc206fa98640159488b71eab9231fed77b080d3

30

-AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf369fab24d08de566e1a64849e2e79 SHA512 79777b19e8ab56a855540c89d0f2d8a00fa40143efa5bded05be71b9ef45045f533128ccef691dd6667f3934c076968abf7fcf5aa311af56c63ba201efe4e3d5 WHIRLPOOL 428f477ccfcf0e4bec3b80d073d4f18d18e520afb24780a5682d146395bbb4067b3fbcb5aabc2f2304de435a8e316433fb32c9d1fc84380fcf17a4d428f521f7

31

+AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 SHA512 e4d057665461dc27bda326178c8c21dbe75458a9cdc3cf976cf1e5b549d18732cd538c17fbad1f67b09188da0650e8d9c16d43076ffcfe06003484ddb442eb04 WHIRLPOOL f741e12a2a03a56a24ee734f6cf56d16d7621d708b87ea3be04e11b99cf24b9af53c88c4304c3b2d225e51c7403f8aacb1fcb152cc227bb5f98d6dea276250be

32

 AUX kdelibs-4.10.0-udisks.patch 2012 SHA256 a856a103831162da416ea07ab9f18db5d5eb4732ee9203c9d6799a4616e53f25 SHA512 b22d2f70f17618d5f2d11e9037c4d198a1fa11252d59098f120cc77cc12bcb3d90f1a69c63f33abb01217f396f3eb51ea8285e5ff5306eb41e63cc15654ced33 WHIRLPOOL 6c6b33afdb29fda62798f9b7121711bf8f8de44bd4839523316abb9a2a05e6e9f773e700b1e43fc75564aa82d18490aeec5ca04c51418d37d2f9b3c8924daf9f

33

+AUX kdelibs-4.14.13-FindQt4.patch 1446 SHA256 1b64f6ab5a72f9be4fdc3bf92dfe4d6292e3ad39d322ac695e8d167f8cc9664b SHA512 454dcad581e38e296e16bf3be507966f97889789492c1c8b82ebd92f68fbdf6d5015da65a70fcc25285d520748497ee7ae55fc5e422588a505dc5a0408ac0b1e WHIRLPOOL 0bf15dce7432160b2f3d2bf780e648c0cce17b31b70d80b355de5d95989faa5eb9cf613c70e37dfad42d999211215a0399e7e5c6c27afb15eb186272f7d3127e

34

+AUX kdelibs-4.14.15-revert.patch 1641 SHA256 02d0655afdfafc19894dc208ee8bec7e50e628015b1cf0ae9a735a7d7c4963bd SHA512 92a60ca8abed64cd0af40ce886e86d9451ae269b099a5f2e6b37cdeae6e20fe301cf99d16b5d2534d9c4b3a9d4fb0884d4f30d2db8c8f5820eaf7fbbbf40f586 WHIRLPOOL 5b3b456041dd524a801d66b2ca2419338282e6120a6db38c14cfe5a64eaf770f3aa16b174052c51caf59a57fbbc206fa98640159488b71eab9231fed77b080d3

35

 AUX kdelibs-4.14.5-fatalwarnings.patch 1066 SHA256 480fb7374bb00e6ff3b97a4082cf5ab90fd9384c8a5b3b49f0d73ad12ae103e5 SHA512 4758f504752a3ff5e1f315626eb58a796b8320a088b4821c2111723ae8ac63eeb368f7d9307e6e88dfa88e52611e80ae068ac15302265ae44b7bb55b98530f41 WHIRLPOOL 9c487d26a6ec2f6749bcf162b311ab3c441ed062182653a4dd322e78fa3d2049bd0edee677e99687e368b57a6d821f351804747c91432cb36318bc68dc300746

36

-AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb SHA512 5e538746b94dc7006e20ce7ac5135ff19d1fefa98b1d2417ad01acd67fb930ca4fc16c4900d9405aeb5a4de2cfc3b75aeb25676b25a6f216ce8e8e06aca009e1 WHIRLPOOL 8c9817b7595f64f7484ecaa2d3f57ae434ec573378a0d857a39d4dfbfa61af74ada92bc20be7964049ccba88b9444b4176bfaceb014d8f0b1d5bffd00b08a1e7

37

+AUX kdelibs-4.14.5-mimetypes.patch 801 SHA256 4506dcac847d7fd407b249135c849dcd4992f56a06970a7c5985e9249554e69b SHA512 bd39c356fc88ad09c31c33fc91a35827846f30056a05e4ca6a5483e422709d28e887dbf1c5f9ce229331ee534553bf43ae88e9e51a6e5d759896ebe3e336c2e0 WHIRLPOOL 2c53dde672d2b417745ee63a5e2b91ebfd74dab5861e19d8236060ec0502094190af1cf3d2dc86efb7090dc637481d938b17d2254ec86ec9ff591d3b3dbdd5e0

38

 AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a SHA512 9207f2ab33e757d3d8ed3279350ea4326339129f232bb67bcce7b3806480fe551c9ba03a93d289df311e913055c343c925f957eb0b0b24bec6a7ef59017090a2 WHIRLPOOL f63b26fc0657f7e72856b493fc469af1cfaa68bb18b1dd4078f9dae44c37a3bdec9114c6a2c92c55b2cdde4d7cbc2ea072df1157b26e43f844dccf16ec8b1f8d

39

+AUX kdelibs-4.4.90-xslt.patch 553 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea WHIRLPOOL 8fd53eb3a5bb083b12f1ff1e68f5ba9208a5badd0210944bf62297899a7416d61cbd29d24adc02024b70789bad289abafcfa24b02370e5ea5929b39022dc6f46

40

+AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb SHA512 5e538746b94dc7006e20ce7ac5135ff19d1fefa98b1d2417ad01acd67fb930ca4fc16c4900d9405aeb5a4de2cfc3b75aeb25676b25a6f216ce8e8e06aca009e1 WHIRLPOOL 8c9817b7595f64f7484ecaa2d3f57ae434ec573378a0d857a39d4dfbfa61af74ada92bc20be7964049ccba88b9444b4176bfaceb014d8f0b1d5bffd00b08a1e7

41

+AUX kdelibs-4.8.1-norpath.patch 788 SHA256 813acf8e0b23eeac94d6f504ca53a3a5cc2fb8c33fa93b0398c99bb862a8cead SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89 WHIRLPOOL 9861fe4b4b61c6d659c31c102938f9b0377bfff90744a852f8d0251c6c66e1df29dacb4059610d9ec78e706ad36f66b3cb6179550de47270d759acb4004c46e8

42

+AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf369fab24d08de566e1a64849e2e79 SHA512 79777b19e8ab56a855540c89d0f2d8a00fa40143efa5bded05be71b9ef45045f533128ccef691dd6667f3934c076968abf7fcf5aa311af56c63ba201efe4e3d5 WHIRLPOOL 428f477ccfcf0e4bec3b80d073d4f18d18e520afb24780a5682d146395bbb4067b3fbcb5aabc2f2304de435a8e316433fb32c9d1fc84380fcf17a4d428f521f7

43

 DIST kdelibs-4.14.14.tar.xz 11631016 SHA256 63199b12957211b5ba0250b82da1d8ebc84cd5e55df287ea588cc69745c0b614 SHA512 93e6bb918449df51bc39b7b952e9487f77759616ebdae1f6f244e3a6dd7a60ee49ca2cf21eca7bc90226b7a7b9669096717ceefbc2af43cc96291f849dfe3791 WHIRLPOOL 603652472b0e813cf101d41b55afc7ed1b373f7cb7b5757cac2713615481483c1f8618968673cad5e79d5e42af505acb5bf932f29bfd142b4d9cf2616e8655d8

44

 DIST kdelibs-4.14.15.tar.xz 11633836 SHA256 479ddc9cab1c6c615456bebd0f09a2710f76273157e99c11c8f3e902e3b22819 SHA512 a50dcf8bd06024efe4c4e62a7822cd4e20820452812e1a41961d32b8b8dd2ae52346220830a5ab2ebf6f7a99071852fa21f8dca6e4ba6ddb872b5023b7b2d6df WHIRLPOOL 067aac20c9cca4a3acf06daeed4c15214f8579b8475a45ec4ceeabfce5c0caa7256d847a9dd417680cca30cdd3edd49c826cb11f1c7a2bc67ab2f4d8220edcdb

45

 DIST kdelibs-4.14.16.tar.xz 11633476 SHA256 7bf6b930c49952dceb1a090c20bf567f4385a2bbc0069a4393608b2a79e6b3aa SHA512 882df4ce0a2f77fdc2fddbeae401c961c639b12ee2f198c2afd458eb7bcb41268924033b348fc1ef187f273783b92ae05a87422def3751d4003836bda9b153bd WHIRLPOOL 96e45ac474e4c79bf031047fdb6fe74066ae95cfaf13484498632cfcfd18409ffe46e13b3e72403d2d53fc24e78008f55061c146fbdb5631a80b4ae759e6bebf

46

 DIST kdelibs-4.14.8.tar.xz 11648060 SHA256 705fa8a9b3b3c962aa99d040eb32e68863ba4c2f567b82b9513379defbc39bbb SHA512 0cd5e8dd5cec7cf84bc66c6732f4967610211e521898da41601d24174f909043bafacbb9bd9775666cebb132747e2861c6c8ff07de61be708975f44dbbfb856e WHIRLPOOL 6405ee6b273899a26c39fa005c18be7270888113f93302990003b92ca96c52303ce853c5378c812f4ddf53f40c7b6ff9e2a958bc86a676d1e3abbfe4f3d96bd4

47

-EBUILD kdelibs-4.14.16.ebuild 8652 SHA256 c8c0f8de94f70a6cad01dc513cf10a023d95aa26e97763079294d4e617fef9a9 SHA512 7e2b38b8272877454ec018b8845f574adcd41a15fee51be687ea23aab9deac6a091d2b505d78e75bfdf6b3debf1e27b5df9113bab62fb259b45525096920222c WHIRLPOOL f9c4b117f9240cfab7dc0f41d947eecd97640698b9ae9dea52d64384c059997a9468bdac15ee8ffa93b97380e50449152604f0bd584010ad76b6e8e3472a0d8c

48

 EBUILD kdelibs-4.14.14.ebuild 8650 SHA256 5d51aab7d255cc370262ff70d89f1e11988cb1e5602e7d29d2548f5506b2bdd2 SHA512 c3b9351d26cf215dddad4240dd19e6b9902715a715304b3b7bae373277166d9c77a154a6e228ce2ea04d6c32764689227b285464f0a737cbf543e5892caf50e0 WHIRLPOOL db210cc8a7b829323a508e07f98dbb5e63968f1857f9f1fc34996f276d2a58ed7650bf99dca37bacc8f79141270f5dd556ac521f090aa0a0029f895acbdc5294

49

 EBUILD kdelibs-4.14.15-r1.ebuild 8694 SHA256 90e5a64b770a27206cccf3de3bdc6add9133df683c32178cc4c4637a668a60b7 SHA512 5a1da6a38359d667bb31de9dbb6c5e52976c8dc8b9deea51c5b4bb6bb6e762d5f92603ffac76c0703680c2848e464fffb013b11e8dc29c691ef19b90822a4dd8 WHIRLPOOL ba74808061e5825618273597fa707cb1d848c2534c37fe7be8c9bbd6a7fa1a44883e0ff516d4cb3603608a4c69ee87b340c563ea11a83e452d0a701016954c06

50

+EBUILD kdelibs-4.14.16.ebuild 8732 SHA256 6581e07d4d3d74f440d9dddda78329e7c1ec6d0c6288d6dbde1b3cbc64182012 SHA512 3dc192008de2c3ec49730b5e40116dfbb0a2781c7a8ac71b5e5f9486949ab03f23ef0f2838e3eca78948e18b5fcae236f1cd06c61f8a6b2354117ed0f83787fe WHIRLPOOL a25f26a099d92d8c13a6bf496cf550a65285f6708033519fe43c35a5b36c7d93b6be6bac661f4762553aa84d061fe1198a7f5936a8de8687cacc7df50212e25c

51

 EBUILD kdelibs-4.14.8.ebuild 8513 SHA256 a0f89fcb157a47809f4a2e99057af8408a5eeb6e63a0f917a5947ae8901d946f SHA512 cf0de703b4d311ee41badedb73af6577b3d97ce869cda72f5ef851dfd21fa0c96fc60273e42cb25dcf17d75a701e3fe841e60d7884c86e97669aee02f440f0c5 WHIRLPOOL fc9d7c8482e1b456d70b20b9256875bf047b49414d224469dc9af4db7ab9c3edb7d32e8e682f89194c663235007de256b3d0e1d3c5b55c33482409b0c04c4c07

52

 MISC metadata.xml 337 SHA256 6ed84743a51fdfeaa4bb8b6822b54e7e0750e1e99ac23a8589524b48e8f5f138 SHA512 47b35bcbaea571d9b84c97ab849cd2f7a6287908e1bf71ffee62d13d3a77bf53feaa34ed21c7aaae7e342ffd2f3dccd9b2037c5343c98cb609faf216b0e225ab WHIRLPOOL 41200da9552745447bc17ed06ae263fe6c3a18844c58aa8d473d5391b37bf1296e63e0198a2fb9f2013f59de4c1dec8bdaf60b424a0caea47acb99ad81d2ad0c

53

------BEGIN PGP SIGNATURE-----

54

-Version: GnuPG v2

55

-

56

-iQEcBAEBCAAGBQJWpWGaAAoJELoICR7GMXs8uuIH/i3DqT/QxvBxKM+PZ+gqUm8i

57

-50N2ZUSSZTHd4oecUUIT7FPsZz98rm4bfjJzCxAUSj9YTXRwh2NxggkHw5WQzaxZ

58

-mf/PIVt3iQm8okcfBnSnoRCZ8NVJmeIKVT7VWOT0cZxPepPfiMQLFv97a/mvK8fG

59

-wxCLM1vgaKN15KyQCpv2o9qe0D28vK0B8D5KVnwvaRnGSQ4KAnotd4c+XmJtB54L

60

-VK5A0GwKB4Ee986y7ToLIC21tYkGsAmmXOJkiherVvwXLJ5RJ3LN/lsOV33pDfHQ

61

-4jlXQ3NCfTOvgW/Q03VkUYsZw9ZaUXablOZtoE6q8SqvXykshk27VAPpIhzahBs=

62

-=S5+G

63

------END PGP SIGNATURE-----

64

65

diff --git a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch

66

index 4d413b7..bd54725 100644

67

--- a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch

68

+++ b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch

69

@@ -19,8 +19,8 @@ Gentoo-bug: 562746

70

 +if(CMAKE_BUILD_TYPE STREQUAL Gentoo)

71

 +  find_program(QT_QMAKE_EXECUTABLE NAMES qmake

72

 +    PATHS

73

-+      /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin

74

-+      /usr/bin

75

++      @GENTOO_PORTAGE_EPREFIX@/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin

76

++      @GENTOO_PORTAGE_EPREFIX@/usr/bin

77

 +      NO_DEFAULT_PATH

78

 +    DOC "The qmake executable for the Qt installation to use"

79

 +  )

80

81

diff --git a/kde-base/kdelibs/kdelibs-4.14.16.ebuild b/kde-base/kdelibs/kdelibs-4.14.16.ebuild

82

index a8a717f..9a30894 100644

83

--- a/kde-base/kdelibs/kdelibs-4.14.16.ebuild

84

+++ b/kde-base/kdelibs/kdelibs-4.14.16.ebuild

85

@@ -9,7 +9,7 @@ CPPUNIT_REQUIRED="optional"

86

 DECLARATIVE_REQUIRED="always"

87

 OPENGL_REQUIRED="optional"

88

 KDE_HANDBOOK="optional"

89

-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic

90

+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic prefix

91

92

 EGIT_BRANCH="KDE/4.14"

93

94

@@ -150,6 +150,8 @@ pkg_pretend() {

95

 src_prepare() {

96

 	kde4-base_src_prepare

97

98

+	eprefixify cmake/modules/FindQt4.cmake

99

+

100

 	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)

101

 	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \

102

 		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."

103

@@ -218,6 +220,8 @@ src_configure() {

104

 		$(cmake-utils_use_with udev UDev)

105

 		$(cmake-utils_use_with udisks SOLID_UDISKS2)

106

 		$(cmake-utils_use_with zeroconf Avahi)

107

+		-Wno-dev

108

+		--debug-trycompile

109

)

110

 	kde4-base_src_configure

111

}

1	commit: 7afc276dba32b97d00e651cfb04550ff3c1410f8
2	Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3	AuthorDate: Tue May 24 13:48:38 2016 +0000
4	Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5	CommitDate: Tue May 24 13:48:38 2016 +0000
6	URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=7afc276d
7
8	kde-base/kdelibs: FindQT4 prefix.
9
10	kde-base/kdelibs/Manifest \| 32 ++++++----------------
11	.../kdelibs/files/kdelibs-4.14.13-FindQt4.patch \| 4 +--
12	kde-base/kdelibs/kdelibs-4.14.16.ebuild \| 6 +++-
13	3 files changed, 16 insertions(+), 26 deletions(-)
14
15	diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
16	index 70c0674..40caba1 100644
17	--- a/kde-base/kdelibs/Manifest
18	+++ b/kde-base/kdelibs/Manifest
19	@@ -1,35 +1,21 @@
20	------BEGIN PGP SIGNED MESSAGE-----
21	-Hash: SHA256
22	-
23	-AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 SHA512 e4d057665461dc27bda326178c8c21dbe75458a9cdc3cf976cf1e5b549d18732cd538c17fbad1f67b09188da0650e8d9c16d43076ffcfe06003484ddb442eb04 WHIRLPOOL f741e12a2a03a56a24ee734f6cf56d16d7621d708b87ea3be04e11b99cf24b9af53c88c4304c3b2d225e51c7403f8aacb1fcb152cc227bb5f98d6dea276250be
24	AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341 SHA512 33a7eeb58b65ce28f0fadc1f6c7133e670391330d084df39990bb0a5b4ddd78f52375c1ebc620823adfe4eee22f10b85064d3fdcb6df0f63c5f6e757357e7ca7 WHIRLPOOL c585ed614ae27e0694156a7af68e222fe13578db95e611b592896475772572c316a05a60b39d1797d28f2c7bea52736ac41c5ee096a92e09e945c34f07ecf69c
25	-AUX kdelibs-4.8.1-norpath.patch 788 SHA256 813acf8e0b23eeac94d6f504ca53a3a5cc2fb8c33fa93b0398c99bb862a8cead SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89 WHIRLPOOL 9861fe4b4b61c6d659c31c102938f9b0377bfff90744a852f8d0251c6c66e1df29dacb4059610d9ec78e706ad36f66b3cb6179550de47270d759acb4004c46e8
26	-AUX kdelibs-4.14.5-mimetypes.patch 801 SHA256 4506dcac847d7fd407b249135c849dcd4992f56a06970a7c5985e9249554e69b SHA512 bd39c356fc88ad09c31c33fc91a35827846f30056a05e4ca6a5483e422709d28e887dbf1c5f9ce229331ee534553bf43ae88e9e51a6e5d759896ebe3e336c2e0 WHIRLPOOL 2c53dde672d2b417745ee63a5e2b91ebfd74dab5861e19d8236060ec0502094190af1cf3d2dc86efb7090dc637481d938b17d2254ec86ec9ff591d3b3dbdd5e0
27	-AUX kdelibs-4.4.90-xslt.patch 553 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea WHIRLPOOL 8fd53eb3a5bb083b12f1ff1e68f5ba9208a5badd0210944bf62297899a7416d61cbd29d24adc02024b70789bad289abafcfa24b02370e5ea5929b39022dc6f46
28	-AUX kdelibs-4.14.13-FindQt4.patch 1398 SHA256 6ed258c0c6cde178d78022d7f35ba61829021a925581e79b7c45afad51404ddc SHA512 59a88a05206526837d265417435c9e61d23367f608ca5bb142d4b9eaa74346687de7983d241e86c79fb6d4d6e19c2a24572b698f4b244849b8d348cf10c575f3 WHIRLPOOL ce4ceac81650284f0e3aaeba0bf63f3bb27ac7e31eabab1fdcd05d6c52c7d8ad0bd699beea21cf3ea8f11ae16d96e8a04ea7b8dbc8540003447c4e3befb70d69
29	-AUX kdelibs-4.14.15-revert.patch 1641 SHA256 02d0655afdfafc19894dc208ee8bec7e50e628015b1cf0ae9a735a7d7c4963bd SHA512 92a60ca8abed64cd0af40ce886e86d9451ae269b099a5f2e6b37cdeae6e20fe301cf99d16b5d2534d9c4b3a9d4fb0884d4f30d2db8c8f5820eaf7fbbbf40f586 WHIRLPOOL 5b3b456041dd524a801d66b2ca2419338282e6120a6db38c14cfe5a64eaf770f3aa16b174052c51caf59a57fbbc206fa98640159488b71eab9231fed77b080d3
30	-AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf369fab24d08de566e1a64849e2e79 SHA512 79777b19e8ab56a855540c89d0f2d8a00fa40143efa5bded05be71b9ef45045f533128ccef691dd6667f3934c076968abf7fcf5aa311af56c63ba201efe4e3d5 WHIRLPOOL 428f477ccfcf0e4bec3b80d073d4f18d18e520afb24780a5682d146395bbb4067b3fbcb5aabc2f2304de435a8e316433fb32c9d1fc84380fcf17a4d428f521f7
31	+AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 SHA512 e4d057665461dc27bda326178c8c21dbe75458a9cdc3cf976cf1e5b549d18732cd538c17fbad1f67b09188da0650e8d9c16d43076ffcfe06003484ddb442eb04 WHIRLPOOL f741e12a2a03a56a24ee734f6cf56d16d7621d708b87ea3be04e11b99cf24b9af53c88c4304c3b2d225e51c7403f8aacb1fcb152cc227bb5f98d6dea276250be
32	AUX kdelibs-4.10.0-udisks.patch 2012 SHA256 a856a103831162da416ea07ab9f18db5d5eb4732ee9203c9d6799a4616e53f25 SHA512 b22d2f70f17618d5f2d11e9037c4d198a1fa11252d59098f120cc77cc12bcb3d90f1a69c63f33abb01217f396f3eb51ea8285e5ff5306eb41e63cc15654ced33 WHIRLPOOL 6c6b33afdb29fda62798f9b7121711bf8f8de44bd4839523316abb9a2a05e6e9f773e700b1e43fc75564aa82d18490aeec5ca04c51418d37d2f9b3c8924daf9f
33	+AUX kdelibs-4.14.13-FindQt4.patch 1446 SHA256 1b64f6ab5a72f9be4fdc3bf92dfe4d6292e3ad39d322ac695e8d167f8cc9664b SHA512 454dcad581e38e296e16bf3be507966f97889789492c1c8b82ebd92f68fbdf6d5015da65a70fcc25285d520748497ee7ae55fc5e422588a505dc5a0408ac0b1e WHIRLPOOL 0bf15dce7432160b2f3d2bf780e648c0cce17b31b70d80b355de5d95989faa5eb9cf613c70e37dfad42d999211215a0399e7e5c6c27afb15eb186272f7d3127e
34	+AUX kdelibs-4.14.15-revert.patch 1641 SHA256 02d0655afdfafc19894dc208ee8bec7e50e628015b1cf0ae9a735a7d7c4963bd SHA512 92a60ca8abed64cd0af40ce886e86d9451ae269b099a5f2e6b37cdeae6e20fe301cf99d16b5d2534d9c4b3a9d4fb0884d4f30d2db8c8f5820eaf7fbbbf40f586 WHIRLPOOL 5b3b456041dd524a801d66b2ca2419338282e6120a6db38c14cfe5a64eaf770f3aa16b174052c51caf59a57fbbc206fa98640159488b71eab9231fed77b080d3
35	AUX kdelibs-4.14.5-fatalwarnings.patch 1066 SHA256 480fb7374bb00e6ff3b97a4082cf5ab90fd9384c8a5b3b49f0d73ad12ae103e5 SHA512 4758f504752a3ff5e1f315626eb58a796b8320a088b4821c2111723ae8ac63eeb368f7d9307e6e88dfa88e52611e80ae068ac15302265ae44b7bb55b98530f41 WHIRLPOOL 9c487d26a6ec2f6749bcf162b311ab3c441ed062182653a4dd322e78fa3d2049bd0edee677e99687e368b57a6d821f351804747c91432cb36318bc68dc300746
36	-AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb SHA512 5e538746b94dc7006e20ce7ac5135ff19d1fefa98b1d2417ad01acd67fb930ca4fc16c4900d9405aeb5a4de2cfc3b75aeb25676b25a6f216ce8e8e06aca009e1 WHIRLPOOL 8c9817b7595f64f7484ecaa2d3f57ae434ec573378a0d857a39d4dfbfa61af74ada92bc20be7964049ccba88b9444b4176bfaceb014d8f0b1d5bffd00b08a1e7
37	+AUX kdelibs-4.14.5-mimetypes.patch 801 SHA256 4506dcac847d7fd407b249135c849dcd4992f56a06970a7c5985e9249554e69b SHA512 bd39c356fc88ad09c31c33fc91a35827846f30056a05e4ca6a5483e422709d28e887dbf1c5f9ce229331ee534553bf43ae88e9e51a6e5d759896ebe3e336c2e0 WHIRLPOOL 2c53dde672d2b417745ee63a5e2b91ebfd74dab5861e19d8236060ec0502094190af1cf3d2dc86efb7090dc637481d938b17d2254ec86ec9ff591d3b3dbdd5e0
38	AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a SHA512 9207f2ab33e757d3d8ed3279350ea4326339129f232bb67bcce7b3806480fe551c9ba03a93d289df311e913055c343c925f957eb0b0b24bec6a7ef59017090a2 WHIRLPOOL f63b26fc0657f7e72856b493fc469af1cfaa68bb18b1dd4078f9dae44c37a3bdec9114c6a2c92c55b2cdde4d7cbc2ea072df1157b26e43f844dccf16ec8b1f8d
39	+AUX kdelibs-4.4.90-xslt.patch 553 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea WHIRLPOOL 8fd53eb3a5bb083b12f1ff1e68f5ba9208a5badd0210944bf62297899a7416d61cbd29d24adc02024b70789bad289abafcfa24b02370e5ea5929b39022dc6f46
40	+AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb SHA512 5e538746b94dc7006e20ce7ac5135ff19d1fefa98b1d2417ad01acd67fb930ca4fc16c4900d9405aeb5a4de2cfc3b75aeb25676b25a6f216ce8e8e06aca009e1 WHIRLPOOL 8c9817b7595f64f7484ecaa2d3f57ae434ec573378a0d857a39d4dfbfa61af74ada92bc20be7964049ccba88b9444b4176bfaceb014d8f0b1d5bffd00b08a1e7
41	+AUX kdelibs-4.8.1-norpath.patch 788 SHA256 813acf8e0b23eeac94d6f504ca53a3a5cc2fb8c33fa93b0398c99bb862a8cead SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89 WHIRLPOOL 9861fe4b4b61c6d659c31c102938f9b0377bfff90744a852f8d0251c6c66e1df29dacb4059610d9ec78e706ad36f66b3cb6179550de47270d759acb4004c46e8
42	+AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf369fab24d08de566e1a64849e2e79 SHA512 79777b19e8ab56a855540c89d0f2d8a00fa40143efa5bded05be71b9ef45045f533128ccef691dd6667f3934c076968abf7fcf5aa311af56c63ba201efe4e3d5 WHIRLPOOL 428f477ccfcf0e4bec3b80d073d4f18d18e520afb24780a5682d146395bbb4067b3fbcb5aabc2f2304de435a8e316433fb32c9d1fc84380fcf17a4d428f521f7
43	DIST kdelibs-4.14.14.tar.xz 11631016 SHA256 63199b12957211b5ba0250b82da1d8ebc84cd5e55df287ea588cc69745c0b614 SHA512 93e6bb918449df51bc39b7b952e9487f77759616ebdae1f6f244e3a6dd7a60ee49ca2cf21eca7bc90226b7a7b9669096717ceefbc2af43cc96291f849dfe3791 WHIRLPOOL 603652472b0e813cf101d41b55afc7ed1b373f7cb7b5757cac2713615481483c1f8618968673cad5e79d5e42af505acb5bf932f29bfd142b4d9cf2616e8655d8
44	DIST kdelibs-4.14.15.tar.xz 11633836 SHA256 479ddc9cab1c6c615456bebd0f09a2710f76273157e99c11c8f3e902e3b22819 SHA512 a50dcf8bd06024efe4c4e62a7822cd4e20820452812e1a41961d32b8b8dd2ae52346220830a5ab2ebf6f7a99071852fa21f8dca6e4ba6ddb872b5023b7b2d6df WHIRLPOOL 067aac20c9cca4a3acf06daeed4c15214f8579b8475a45ec4ceeabfce5c0caa7256d847a9dd417680cca30cdd3edd49c826cb11f1c7a2bc67ab2f4d8220edcdb
45	DIST kdelibs-4.14.16.tar.xz 11633476 SHA256 7bf6b930c49952dceb1a090c20bf567f4385a2bbc0069a4393608b2a79e6b3aa SHA512 882df4ce0a2f77fdc2fddbeae401c961c639b12ee2f198c2afd458eb7bcb41268924033b348fc1ef187f273783b92ae05a87422def3751d4003836bda9b153bd WHIRLPOOL 96e45ac474e4c79bf031047fdb6fe74066ae95cfaf13484498632cfcfd18409ffe46e13b3e72403d2d53fc24e78008f55061c146fbdb5631a80b4ae759e6bebf
46	DIST kdelibs-4.14.8.tar.xz 11648060 SHA256 705fa8a9b3b3c962aa99d040eb32e68863ba4c2f567b82b9513379defbc39bbb SHA512 0cd5e8dd5cec7cf84bc66c6732f4967610211e521898da41601d24174f909043bafacbb9bd9775666cebb132747e2861c6c8ff07de61be708975f44dbbfb856e WHIRLPOOL 6405ee6b273899a26c39fa005c18be7270888113f93302990003b92ca96c52303ce853c5378c812f4ddf53f40c7b6ff9e2a958bc86a676d1e3abbfe4f3d96bd4
47	-EBUILD kdelibs-4.14.16.ebuild 8652 SHA256 c8c0f8de94f70a6cad01dc513cf10a023d95aa26e97763079294d4e617fef9a9 SHA512 7e2b38b8272877454ec018b8845f574adcd41a15fee51be687ea23aab9deac6a091d2b505d78e75bfdf6b3debf1e27b5df9113bab62fb259b45525096920222c WHIRLPOOL f9c4b117f9240cfab7dc0f41d947eecd97640698b9ae9dea52d64384c059997a9468bdac15ee8ffa93b97380e50449152604f0bd584010ad76b6e8e3472a0d8c
48	EBUILD kdelibs-4.14.14.ebuild 8650 SHA256 5d51aab7d255cc370262ff70d89f1e11988cb1e5602e7d29d2548f5506b2bdd2 SHA512 c3b9351d26cf215dddad4240dd19e6b9902715a715304b3b7bae373277166d9c77a154a6e228ce2ea04d6c32764689227b285464f0a737cbf543e5892caf50e0 WHIRLPOOL db210cc8a7b829323a508e07f98dbb5e63968f1857f9f1fc34996f276d2a58ed7650bf99dca37bacc8f79141270f5dd556ac521f090aa0a0029f895acbdc5294
49	EBUILD kdelibs-4.14.15-r1.ebuild 8694 SHA256 90e5a64b770a27206cccf3de3bdc6add9133df683c32178cc4c4637a668a60b7 SHA512 5a1da6a38359d667bb31de9dbb6c5e52976c8dc8b9deea51c5b4bb6bb6e762d5f92603ffac76c0703680c2848e464fffb013b11e8dc29c691ef19b90822a4dd8 WHIRLPOOL ba74808061e5825618273597fa707cb1d848c2534c37fe7be8c9bbd6a7fa1a44883e0ff516d4cb3603608a4c69ee87b340c563ea11a83e452d0a701016954c06
50	+EBUILD kdelibs-4.14.16.ebuild 8732 SHA256 6581e07d4d3d74f440d9dddda78329e7c1ec6d0c6288d6dbde1b3cbc64182012 SHA512 3dc192008de2c3ec49730b5e40116dfbb0a2781c7a8ac71b5e5f9486949ab03f23ef0f2838e3eca78948e18b5fcae236f1cd06c61f8a6b2354117ed0f83787fe WHIRLPOOL a25f26a099d92d8c13a6bf496cf550a65285f6708033519fe43c35a5b36c7d93b6be6bac661f4762553aa84d061fe1198a7f5936a8de8687cacc7df50212e25c
51	EBUILD kdelibs-4.14.8.ebuild 8513 SHA256 a0f89fcb157a47809f4a2e99057af8408a5eeb6e63a0f917a5947ae8901d946f SHA512 cf0de703b4d311ee41badedb73af6577b3d97ce869cda72f5ef851dfd21fa0c96fc60273e42cb25dcf17d75a701e3fe841e60d7884c86e97669aee02f440f0c5 WHIRLPOOL fc9d7c8482e1b456d70b20b9256875bf047b49414d224469dc9af4db7ab9c3edb7d32e8e682f89194c663235007de256b3d0e1d3c5b55c33482409b0c04c4c07
52	MISC metadata.xml 337 SHA256 6ed84743a51fdfeaa4bb8b6822b54e7e0750e1e99ac23a8589524b48e8f5f138 SHA512 47b35bcbaea571d9b84c97ab849cd2f7a6287908e1bf71ffee62d13d3a77bf53feaa34ed21c7aaae7e342ffd2f3dccd9b2037c5343c98cb609faf216b0e225ab WHIRLPOOL 41200da9552745447bc17ed06ae263fe6c3a18844c58aa8d473d5391b37bf1296e63e0198a2fb9f2013f59de4c1dec8bdaf60b424a0caea47acb99ad81d2ad0c
53	------BEGIN PGP SIGNATURE-----
54	-Version: GnuPG v2
55	-
56	-iQEcBAEBCAAGBQJWpWGaAAoJELoICR7GMXs8uuIH/i3DqT/QxvBxKM+PZ+gqUm8i
57	-50N2ZUSSZTHd4oecUUIT7FPsZz98rm4bfjJzCxAUSj9YTXRwh2NxggkHw5WQzaxZ
58	-mf/PIVt3iQm8okcfBnSnoRCZ8NVJmeIKVT7VWOT0cZxPepPfiMQLFv97a/mvK8fG
59	-wxCLM1vgaKN15KyQCpv2o9qe0D28vK0B8D5KVnwvaRnGSQ4KAnotd4c+XmJtB54L
60	-VK5A0GwKB4Ee986y7ToLIC21tYkGsAmmXOJkiherVvwXLJ5RJ3LN/lsOV33pDfHQ
61	-4jlXQ3NCfTOvgW/Q03VkUYsZw9ZaUXablOZtoE6q8SqvXykshk27VAPpIhzahBs=
62	-=S5+G
63	------END PGP SIGNATURE-----
64
65	diff --git a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
66	index 4d413b7..bd54725 100644
67	--- a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
68	+++ b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch
69	@@ -19,8 +19,8 @@ Gentoo-bug: 562746
70	+if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
71	+ find_program(QT_QMAKE_EXECUTABLE NAMES qmake
72	+ PATHS
73	-+ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
74	-+ /usr/bin
75	++ @GENTOO_PORTAGE_EPREFIX@/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
76	++ @GENTOO_PORTAGE_EPREFIX@/usr/bin
77	+ NO_DEFAULT_PATH
78	+ DOC "The qmake executable for the Qt installation to use"
79	+ )
80
81	diff --git a/kde-base/kdelibs/kdelibs-4.14.16.ebuild b/kde-base/kdelibs/kdelibs-4.14.16.ebuild
82	index a8a717f..9a30894 100644
83	--- a/kde-base/kdelibs/kdelibs-4.14.16.ebuild
84	+++ b/kde-base/kdelibs/kdelibs-4.14.16.ebuild
85	@@ -9,7 +9,7 @@ CPPUNIT_REQUIRED="optional"
86	DECLARATIVE_REQUIRED="always"
87	OPENGL_REQUIRED="optional"
88	KDE_HANDBOOK="optional"
89	-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
90	+inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic prefix
91
92	EGIT_BRANCH="KDE/4.14"
93
94	@@ -150,6 +150,8 @@ pkg_pretend() {
95	src_prepare() {
96	kde4-base_src_prepare
97
98	+ eprefixify cmake/modules/FindQt4.cmake
99	+
100	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
101	sed -e 's\|FILES[[:space:]]applications.menu\|FILES applications.menu RENAME kde-4-applications.menu\|g' \
102	-i kded/CMakeLists.txt \|\| die "Sed on CMakeLists.txt for applications.menu failed."
103	@@ -218,6 +220,8 @@ src_configure() {
104	$(cmake-utils_use_with udev UDev)
105	$(cmake-utils_use_with udisks SOLID_UDISKS2)
106	$(cmake-utils_use_with zeroconf Avahi)
107	+ -Wno-dev
108	+ --debug-trycompile
109	)
110	kde4-base_src_configure
111	}

Gentoo Archives: gentoo-commits