Install cups-config for all ABIs, and add it to MULTILIB_CHOST_TOOLS.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

5 files changed, 41 insertions, 22 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 436205d74184..5c4cd0f0145f 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.613 2014/05/30 21:26:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.614 2014/06/02 15:03:36 mgorny Exp $
+
+  02 Jun 2014; Michał Górny <mgorny@gentoo.org> cups-1.7.1-r2.ebuild,
+  cups-1.7.2-r1.ebuild, cups-9999.ebuild:
+  Install cups-config for all ABIs, and add it to MULTILIB_CHOST_TOOLS.
 
   30 May 2014; Michał Górny <mgorny@gentoo.org> cups-1.7.1-r2.ebuild,
   cups-1.7.2-r1.ebuild, cups-9999.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index a623c0128fb9..30c8aae961c3 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -11,28 +11,28 @@ AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486
 DIST cups-1.7.1-source.tar.bz2 8738002 SHA256 f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681 SHA512 e52f98f00e8b2c0eb7a8b29a8ed5e33b14b1a68a18f3f4558e473d8146c2dfd659c9a96ae07257c456d7a34dcc7bcabf858dcf719e8557173c8849d734711e57 WHIRLPOOL b715560357b22d0cc5887059137b79132e1f46a9adc76410d3ad2e8a1a16047fd2179372632f544b1d798a03a3d41410071f09d2ed82aeda66afe789c080cb04
 DIST cups-1.7.2-source.tar.bz2 8754601 SHA256 315cdff436924c4efe04cb110b145fb1a6e038e2eed8445359052f86e9e95676 SHA512 441256bdfbe4a720244143d229f12e0a3e2e27e6298baee3ddca9f7f6bd3e3c2818136c90a110bebbbf9b034a48f8bd1af06788c25258e61aa3bc524e492a912 WHIRLPOOL b3c977275a89c6c8b2773bddf615168bcc6f2379bf49f991e0141eb5db482035e0e611d22d6c99351dc1e41e003470322dedabcc37244289c237671bae5f792c
 EBUILD cups-1.7.1-r1.ebuild 9367 SHA256 c53c059d2b73d4daf6c55e3d152bcc4d8a7956f8f95673bd3974af8119bf6e9c SHA512 f4410d2923ed7cd0a64db20eee1b73a5c1103b0425f02959a0c7aa36d2201d1b9846f0afea7d12a3169c42df9a292510eafb675672989187eede14032a01ac98 WHIRLPOOL 142be888cad5bfae60c4075fe9f04093b0408ea8b28c9b355b6a9ed87c1cd3a847d7af1a6a4e40dabcbb0f0ac71276b643c783f714910d158d2e67c6cd573c1e
-EBUILD cups-1.7.1-r2.ebuild 10316 SHA256 8166b0bb6b69605eac008adf89acf8e17af630508a3e4e8b91a927f4199f967c SHA512 e4003924cd1572ba3449b05a612d0f33023eda2940e5afbb7d2606c4831e72c90c0f931115aaa585f0376823a558dba78432bff5d60eb0ad4bc8da51a23d2b65 WHIRLPOOL f3f2d356f7f9dce8ff4da2e0350b3ebe77c99855efba920a658510f8f10805e7cf76abfa53fc78da6f09dc7053aa95dbd9e6dd40323f28a36a218875c2c77b35
-EBUILD cups-1.7.2-r1.ebuild 10254 SHA256 597221cc50f76f0b3624e1031d03f3200f6a0414b51ab9cc5d232fe1a58a183b SHA512 db15164e3bd4d346145cb7e1bbcf611f36e7c4268df4edb043c8280e8ca906fd30d0745b862c6a215882ca9056830339d311854d89ef53b3cec7fe10eb0ce259 WHIRLPOOL 5100ef1766d33700273e2f0322b6d549d5908b5ab229dcfd5aaf6564e9865a88c71d0860438171d8bec0af4a97440d47e41512eb537559bdbafa1cbeab6c4b24
+EBUILD cups-1.7.1-r2.ebuild 10384 SHA256 5f05159ae44f4c753ab26e24d14d5c7edd7714284f975ea94c3a5c9e962d2153 SHA512 c36ea73d2eb393c3ec63a7dea96b8a8c6ead92810a26a7839e207b3b5f1d16a312da433a7cfdced1dafce52f3b74f8a1152fe8add8a79873fa0961d618b859ae WHIRLPOOL c5e3ea89d2b05b6746325d0eed34fa4f3b6498fa0069e19e29a0f51ba24d7699bdca7e76f07883ccda6e66c543d2aa3d1e8e0d6eaad6355c128f733f906b675f
+EBUILD cups-1.7.2-r1.ebuild 10322 SHA256 cd8a55421d2ce001f88a9fa6904f19eb2e09ba01a0849dda0c7a517b7d2e3cc8 SHA512 df9a61f3458dbaea53a5701b634ed18f052a3a8029d5b0011b64400c5debbc40c357db34d4a86d4b18aa5de1c0be752e9e180554b489416f89a23bbef38e41e8 WHIRLPOOL 4413804e1b6aff81f726c7b64523d954ff1996f0034c3de6e1f12517abfb73de3de12592c185487ccad55e43d53391e9c0ae86915370eb6b8c9da352d5d4e445
 EBUILD cups-1.7.2.ebuild 9316 SHA256 45fe7e8a5a85e239d22dff7fcc9aaeb03872722093c05d57f25ddb05b3f32b4c SHA512 8dcba2b955614693a04b8fd452732c084fc7f548ec0349f6694f6d2b1d535407242565e826d2c93675f9431ddf3d13bdef29b71c36c5e0582d8f007916df3b55 WHIRLPOOL 8cbeba452f75000c7760bfda0ae9521552d62890b2ef62d279b3e2ac4e8067d346137de5982447b4d03f49f23f620f9fab640712f67cdfb2e8fa05925a1500dd
-EBUILD cups-9999.ebuild 10237 SHA256 d56967ab70686c9c04435d09882b826813560f8ebec9bd04a7a61d2a2084463a SHA512 3e6ec9266ec496896bf939cec2820d91938b8ad5dfde63b034aea522a391b5073d25c82ed647ce4bf89a315117e884867564c40a263a66f7ae8224846abd2aec WHIRLPOOL 5f61e0543a7e884b5b36d570ad429694046aec887e86230c4cfa57531c63c9eae517efc97a2a1e484c28a69606b005e0848f9c51e30ca3df8e466f348736c674
-MISC ChangeLog 92760 SHA256 534aa09249cb82a8a1762227ac9ccfd143ae82a8208b6befabda6870de1ea06a SHA512 51d316a3e9baa61776569a82766cbe3e7cf15ddad30e6066af21335e1e27a6b0fc379fb551aff5d2c4df923770b1d4bb89dcdd5510dd01145c50dfdf25008a13 WHIRLPOOL 4528b184062f960e472d4959ec16dd97d6a2a6812de7df8a54919226a84ae2ed8f37bfd85dfbc9ec238a492f13b7ddabcf38e36c929de031e957a0ae61f8b00c
+EBUILD cups-9999.ebuild 10305 SHA256 7ac4536a29b9dd2c6217af7d89376dac720844ae6139197dddf30105f27d1a81 SHA512 d0c48c0a9d71f01edd402e3d427cd8fa6068f1a6117aad9b64a6f278730e4601f45dccd4f92e095c7ce5447459a0eadf7b9b7a8b38029158c58aa5e752f17d3a WHIRLPOOL 4e3684a2c1f63027cab6557c4e669f70d6ab71013a1e0de9b91781725c398bebf51cbec682c0460a6662963730280d376808e4e2cc197cd9eb69e37244dc96ac
+MISC ChangeLog 92947 SHA256 8c5f6896b32e6eb23c061281d8958d38403e720e22c11c817eb5d658673f15d1 SHA512 de5530f8d030614c69d8addbe0a803858d5798cd18ba5488cacbc56bf1835f846f6b2606f8d2b52677b6611724ad1a5645d773fd3fb4a53aa11842a31afa6dc4 WHIRLPOOL 1b8c60baa74ab590820473ea681391564ef9fb1b4defab7ed1069647ff6cc5eeea2e957545229191fd4a044df90078e90505ed1e926ae7de40d4bf2af27f8931
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTiPeJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTjJJRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8PYQAKfTXKNfAkF+3vzZWr25jJwc
-RJfR6nhqsClP112y21R268tI4+rb2SS2rSDGfQmp+WnDURywpLKzBi/ofI1nlYMs
-RzBsjlwjMNwpsvQjsYP4ujNwPQDM5mPWOJlsp+DVKUItUB8B2th53qksoNmukh2M
-EWGOOEyID0u0TVzNB209HfeaOBo85LpabQCECWpERkOvV1nBYKdt1m6TVOgk5fUz
-Q2yffU+dzvTLb74WEkLE3MAYCG9cwdQi8kNHZ3oLUfTtSWUt16CYnXvPTIJlBsvm
-obP8iRIlNqo6mzjabVaPtFIzY+vvdOc3oy+8+n/++HHUByLbg9EpBenrerw1MJvr
-yYW42DZppgiAc8pLjegDf1ZPqB/5N1q7OfGklXTHXu2ax5+YTyQzbhIp+DlMZ1Ym
-DgNHGZcOkNeVhgbdSuaBwORTQTtQhJvXQ2ckGF2Gr4h3ti7n7/uDIJAhv/oQvQJ+
-kWOVmT2T7nxo05zrNIt9nCIgi2Yt7u+pV/709DlmllADU4r9oYEK8VGfBBHQgX7A
-B4OFsi/KBFPUaaFeJCmI6qeAJHISvoW8dczTZFtV77pK5oqAFc9TfhMlxzBnQlXw
-o7ZS3dmb2PYK7ixxDs0gx+nxSzvZGcwVJ4Zs6IwKGvNumOGu36EML4hq6yoEAzBx
-aWGcCPFicjxaoTvuqES4
-=aU6W
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOVnwP/1cHiZWTFPJ1nnTF8SPqtZ3D
+i3r630AZx4sBQbA/j/kMkqmBiof6RQ8G3g4ZxU2IAkvIBSr9Mbtk0WwCLWmeNcEv
+0PD0I/R+I/2auIw+daOc7awaLDFpeFfo8R0dQFxN3MvW9oFaiAgXEzJQM1tMH0/l
+5oTIgj/XmFRVD1iFlmJbhqiTOLb0abCEKXcFB4zmccLAOLBdgLrknoeyxlBhLfoE
+xEiRvytX0jDmXcpE0LwRHz52NgVuFYiyK3DuqBds80rs9ZpvRbKOInIjf1JalavV
+JM+98RY710dp3KjGttMirkYwKIHcmxbaScC9BjklvQEkBGfJlh07vOEYWpTEh1Lz
+TEBAzHb9WnaBIhqhX/TRItj8/ZENehb/D7mNBG+zag0kvrfLk5e4TgtT55VWJns1
+WL4eCmZIi0UlMaGDo2ehi9hDJw+tmZalizfoVGXrD0u/M4SLHA1R9Nuxei6mweka
+8FP2wwjWw4hTQQwK+pAH25M0ApB1w7q9X1tKUbAqLvNjKcbRsxV7gvaQQc9NrQKe
+PQI+BecvDL/NXD4ygoK+S4OcSczL8Gx2pk+VRQybA9U8LoOuWeWuTluSIsT+HQIB
+bScsp1hXNp1le3xxiDleKaOTqdNnl4k1xssm9AXFDQjIbmZK7SgjznAYAye14yOD
+foSXZeuTIZMe0x58oD8b
+=MzJV
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.1-r2.ebuild b/net-print/cups/cups-1.7.1-r2.ebuild
index 5e0ec6fb9e14..4544760df901 100644
--- a/net-print/cups/cups-1.7.1-r2.ebuild
+++ b/net-print/cups/cups-1.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v 1.2 2014/05/30 21:26:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v 1.3 2014/06/02 15:03:36 mgorny Exp $
 
 EAPI=5
 
@@ -100,6 +100,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.7.1-str4356.patch"
 )
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
 pkg_setup() {
 	enewgroup lp
 	enewuser lp -1 -1 -1 lp
@@ -244,6 +248,7 @@ multilib_src_install() {
 		emake BUILDROOT="${D}" install
 	else
 		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
 	fi
 }
 
diff --git a/net-print/cups/cups-1.7.2-r1.ebuild b/net-print/cups/cups-1.7.2-r1.ebuild
index 186245c87a8f..4396ae060a4d 100644
--- a/net-print/cups/cups-1.7.2-r1.ebuild
+++ b/net-print/cups/cups-1.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v 1.2 2014/05/30 21:26:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v 1.3 2014/06/02 15:03:36 mgorny Exp $
 
 EAPI=5
 
@@ -100,6 +100,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 )
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
 pkg_setup() {
 	enewgroup lp
 	enewuser lp -1 -1 -1 lp
@@ -244,6 +248,7 @@ multilib_src_install() {
 		emake BUILDROOT="${D}" install
 	else
 		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
 	fi
 }
 
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 63abe38a7a62..944260675484 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.56 2014/05/30 21:26:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.57 2014/06/02 15:03:36 mgorny Exp $
 
 EAPI=5
 
@@ -99,6 +99,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 )
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
 pkg_setup() {
 	enewgroup lp
 	enewuser lp -1 -1 -1 lp
@@ -243,6 +247,7 @@ multilib_src_install() {
 		emake BUILDROOT="${D}" install
 	else
 		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
 	fi
 }