Use bundled libsecret headers to avoid buildtime dependency on libsecret. The library...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 51a123c5cae2549475f566eecc9da7615840a930..7d8f798b089685047e350a43bc884a15a02b37c4 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1237 2015/05/07 16:20:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1238 2015/05/07 22:28:23 floppym Exp $
+
+  07 May 2015; Mike Gilbert <floppym@gentoo.org> chromium-44.0.2391.0.ebuild:
+  Use bundled libsecret headers to avoid buildtime dependency on libsecret. The
+  library is optionally dlopen-ed at runtime. Bug 538224.
 
   07 May 2015; Agostino Sarubbo <ago@gentoo.org> -chromium-42.0.2311.90.ebuild:
   Remove old

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 109d143314abfab6744dbc86b6a278e6e591673a..02d971ecaf29881ee87d493eed9b19d719633b0c 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -23,25 +23,15 @@ EBUILD chromium-42.0.2311.135.ebuild 20565 SHA256 5149d55649f705a8a9e9f233895123
 EBUILD chromium-43.0.2357.18.ebuild 20227 SHA256 551d8fd33258d4070c04ff9d4b0afce713abb535459d4ec980fef0c8f545e5f7 SHA512 4ea50abe9475ae721327533dd93f5ddb2042964bf9da1cb530f07f7d5a6625d941b2f61c7a0318af45c839fa0fe9327551dcaf8a4d0d85c2c92529c5dee441c3 WHIRLPOOL 49ceed48245fc0e03f6427463076a5f8ff0c8e7291190f28c2b74a0e6bea277b53c35fbee75a9c2cfa7e1f1d790afb614cb0d933c1c206b518f8a969f84b5e5a
 EBUILD chromium-43.0.2357.45.ebuild 20237 SHA256 0a1c6bd3572f750ba3f310de83a9716a06552258268bb50881641129a0990486 SHA512 a9c3be9188059697d92b73776c5223fa8487fcca7cac2f0befdc9ca80c6eca1935a215bcf3b1f4ce182c34e3094ab38e607fc623598adba73fd51a5d53c64184 WHIRLPOOL 2ea544cce500dc3ceb8fb02062f180b6e6c2965c9206f29d71f782c0946e262fc1ebc8e0492b0964ca018ae4ca075a81aede1709c0588661ed517ba11b9d5693
 EBUILD chromium-44.0.2383.0.ebuild 20352 SHA256 ed0565ec28a1e284b7081e8f5d8d753dd86b08e57886a1ebacb1e2c78dcaef10 SHA512 4b3de331a2a545fec14b2c97f3b1a0afea5723ff07f1acf9dfe0c6c023f3915baee135c4dda85f6cef9101759f4a4fbca7df4d9cab73137319f5ebf84168d3f9 WHIRLPOOL 19c87236479f828192d05a888ed3a53d62d7b4b15fd2b180e702caa66737ab93f0fece60f09af028da2833e155669abd1ea647471f1c71123088b1bafcad38f3
-EBUILD chromium-44.0.2391.0.ebuild 19433 SHA256 ec9036e6a5d17c2c22e54dfe628267af637dc3dd1da16597931ea0a3f015a051 SHA512 dc4d82db611dcf1946f6b622d83fd2b8e56c242000e37fe2e99346f52cf8337b9a27ed49abade26a8fbfb320d7bf9dbcd2bb22bdeff472d131739ccc2d241813 WHIRLPOOL a6198a02c916a8fa44e0249968a93574ebc377c746e4ebb4708b7eb99941af7535fafce525edaa380da0caea45ab040995ea5d5570cf50f95e3a860d6c6ba0c7
-MISC ChangeLog 11347 SHA256 f2cfb186ed2399e41b89749525f4959e5e28d2d41ef69c01f7e09fae533d4223 SHA512 f55f3a9a275a79c6dbf5c17318da10fa3c5fbee7e8e154509bda952a8a2f7635c38daf9b60cbee988a745c198cd3609cdd87fd04d84fb9547f070fcf29921227 WHIRLPOOL aa160e6ea8b0b552f33f9a50732bc565a15beed0f1d5958cc9171db67220e198ac3d3e7b056dd3ef388aefdb7951dc62406c99e4f0c6059cea6a3bb51dc2017a
+EBUILD chromium-44.0.2391.0.ebuild 19381 SHA256 adc781bbfd88572a6d5ab12f312cf52284d17cd1ccc29b80e328fa19a06c280b SHA512 33d18210a0dc76b88ae8dcb7283a0aadd7fb88fbd86fa56181c3307d26869170c49e29a698d652d2540c5b8151dc25ecca507edf899842f8dfae5224ab858e36 WHIRLPOOL 930fad3133189de35ec042f23329a11a90a1093e6a8650557ff040e1adf59569c512473431dc21dc8241b748ab65d7f70300b192ec14ddc95ee441a35a1ca048
+MISC ChangeLog 11568 SHA256 de015662ed8e9e06e787ac426878727058e271bf6b8aafcf69b7608bade479cd SHA512 13d417cf76598fdd9e47a4e988bcfea1327a7ee4158ee386f75230d13abd9056144bb36fcf69f3fe2712edcd68c66abbcf8298b3b3dbdd14b2b9da93d25ca638 WHIRLPOOL edc9a0fb1b2bfe47ae3548b463e881fd3a1f24c4b8b3ceeaea460cdd6e00948e64b442e05f1f8cf84742e24c4a9ff0faa19b2bd18e210ad79cb781eea00ce64b
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea
 MISC metadata.xml 794 SHA256 325b937cabfd7753347c3c911fb8be689b4a7b021430fca37a92c26e7af35433 SHA512 079c7985283d160b85a8dcd53fd54538ee83b9b36fb99327f03aeff16eb3c6dcbb399a01a381094a67be901d970f3c8fa649b2ac156522df3156db2853b6566f WHIRLPOOL c110adec0f1dcb170e4ba52523109d340543d37027f4c6c9f6e6998744c2720177f03a963e7cd162512459c193e5107f0764b8e3dccf7278b008e7cb8a715b8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVS5DTAAoJELp701BxlEWfEAsQAJciadSNVbOu7njIWrWFg3hd
-nbzXLgMpaM7fSzPpE1X4SPsBg2Nl5H4BP90nwbaQHVGWegorL4Cfz0bUIcZPCQir
-qohSsLNE5z8xQIGpFmzB0jugTbbgFh0nJHW5Pv4uhjN3KCxXH8YjNFkHDxlsWLG/
-ohZDCT7YJYO3jDbsJxtbQzqV2tPY+0bOvbZdxUa65+y8rgYAlLc3WMAo6En6UiV8
-w8sx637/J7QQzbYrYbO9yIVZmZq2l4iwlUVqP6RtZiG6/ao+Ab4e5FCC5PntPgNY
-SricYgnGuhnMXyEYx5FbjaHCMFYmozwi15HpC9aabqTjXG5YrxFw5XGo53DILevQ
-9au82I+UVO6UY9YbqLd9v1rdg57KcY8qfbwXicIo+h7P68k8tDywiD8tFDjqIfWj
-Dm8mTe6skk7hDZOcTf+upPDDpMyPfKRo+zwnQ2+kyrvz707NexI3e6rr9MdfbmBH
-xm0MZ9wVoaxI48aS6PTqj0NLy0oAfE7PwJUjlaxCRF936mVRrSPms7DTla8qzf3C
-zA5SD6v2EAfRwgpPEi7ZRw04RIQRunWMiu87mVwdwAgwLL0uas0fcQYLAIYloPtU
-OkMwUpaRmWnie5bvo+IsfcDH8wuJc5ppzuHQuDbhic6Q4tgYzHCEWzddWLSKGtQA
-VJ6X7C5rsz/XpnMqLrV1
-=W3s1
+iF4EAREIAAYFAlVL5wgACgkQC77qH+pIQ6ShcwD9GrnpwnkMFD4A3jdmpTb+j6PJ
+gGgM5miimLhil6omNG4BAL8wW7GoGu5ZZ1oiR8vhSPQXqNNqg5bHoNcsDM8uX5Df
+=GIH1
 -----END PGP SIGNATURE-----

diff --git a/www-client/chromium/chromium-44.0.2391.0.ebuild b/www-client/chromium/chromium-44.0.2391.0.ebuild
index 202615c99efb05baf4e80065c1a6a786049cc29b..cf28892296da921d9588d159814e3b58c8f8b25f 100644 (file)
--- a/www-client/chromium/chromium-44.0.2391.0.ebuild
+++ b/www-client/chromium/chromium-44.0.2391.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-44.0.2391.0.ebuild,v 1.2 2015/05/06 20:01:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-44.0.2391.0.ebuild,v 1.3 2015/05/07 22:28:23 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -32,7 +32,6 @@ QA_PRESTRIPPED=".*\.nexe"
 RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
        app-arch/bzip2:=
        app-arch/snappy:=
-       >=app-crypt/libsecret-0.18:=
        cups? ( >=net-print/cups-1.3.11:= )
        >=dev-libs/elfutils-0.149
        dev-libs/expat:=
@@ -188,7 +187,6 @@ src_prepare() {
        # fi
 
        epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-       epatch "${FILESDIR}/${PN}-libsecret-r0.patch"
 
        epatch_user
 
@@ -235,6 +233,7 @@ src_prepare() {
                'third_party/libaddressinput' \
                'third_party/libjingle' \
                'third_party/libphonenumber' \
+               'third_party/libsecret' \
                'third_party/libsrtp' \
                'third_party/libudev' \
                'third_party/libusb' \