Fix build if USE=examples (bug #542396, thanks to Leonid Kopylov).

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

diff --git a/dev-cpp/libglademm/ChangeLog b/dev-cpp/libglademm/ChangeLog
index e3bc9711d80281f8285cf771562fa440d2fb3a89..3ab0dbcef5534f015d162a3565d92880f8bb5417 100644 (file)
--- a/dev-cpp/libglademm/ChangeLog
+++ b/dev-cpp/libglademm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/libglademm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/ChangeLog,v 1.90 2015/03/06 05:07:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/ChangeLog,v 1.91 2015/03/07 18:57:02 tetromino Exp $
+
+  07 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libglademm-2.6.7-r1.ebuild:
+  Fix build if USE=examples (bug #542396, thanks to Leonid Kopylov).
 
 *libglademm-2.6.7-r1 (06 Mar 2015)
 

diff --git a/dev-cpp/libglademm/Manifest b/dev-cpp/libglademm/Manifest
index c2cdda2e63bfeba169e59b4858a113fa6d2c217f..b772d1275d389e85a7846fbe24b05ef4d6bdf07b 100644 (file)
--- a/dev-cpp/libglademm/Manifest
+++ b/dev-cpp/libglademm/Manifest
@@ -2,26 +2,26 @@
 Hash: SHA256
 
 DIST libglademm-2.6.7.tar.bz2 326385 SHA256 38543c15acf727434341cc08c2b003d24f36abc22380937707fc2c5c687a2bc3 SHA512 d7042d0549df9322d3202d5c0733d65b153a8ff451bb9e401b9d93a915ec4c2c086428e4febcbae2ecec5936955b7afbc59beff93d492f23b7b8e2b19fe806b0 WHIRLPOOL a25ae3601df4ba201f1b5aeeca9f5527cd804d9481ef7795f651096419833d8a3cbab53d731ac2464ed20b85110d3003011a7fb2ea87e227ad75d301f5317df9
-EBUILD libglademm-2.6.7-r1.ebuild 1898 SHA256 9a319824989836bcf224f2c44cbdb9aab661e45adc29e3d160deff6cfd89edba SHA512 944f2d94530420d3a2f6a1473a771f35d7257ba378c099298909f7bce6d68f49d63dfd8152a9b89bb5b2a94c8915a4cd85e1a5f879df0d089b3698ec38ad4cd9 WHIRLPOOL 4a3d1eaeccafa4d3290d589c239afc5acc7db272411371fdc1c3c6903e4e83bbcb54d025dc61ac2ca24ed4ea7a70a2e33472c6f024a2d1b7804cd55a35788b19
+EBUILD libglademm-2.6.7-r1.ebuild 1921 SHA256 f2a2da694de541828a3209c6cfb5a6d84b60da20cc54c52ee59d23e832562d45 SHA512 7c0b74ae8cbada526f5fb7a93f747c3d08503c672b48a45d7c2bcf4aea994430686da1fb93a06de9d601d220ff9fb57020ba487d365f963fb85103a2c85f9a5f WHIRLPOOL 388994e3fd699eeaaa81b55dba1ae34bf5732f959e3d4d64fbc26201cb1234791ef5b2210f33fb04f1157bebd1909f3a6c73201871d744e32a443cbcfc7fe22b
 EBUILD libglademm-2.6.7.ebuild 1475 SHA256 35daee7396be1a2f33e6d88db7cf1b2b17115bb215ff916febbce431a7e2835b SHA512 d11b9eec466f6b53f099143369d1df0bf0abdebb3d0d8141e78283ef3eeb6e164dde9211a305a330897241fe25c690fe5be2f67d7d892a30dc9fa79150b7b52a WHIRLPOOL 78175169a8574d232635602990c0193d8699b6941d949ce8cdacb718c8dfb6c1379e26f9dde6e214604cbd25cf8683b696af37b09caf47e446145941f6706435
-MISC ChangeLog 12290 SHA256 83c84ec79055d199f0480d400868565666bb3fc944d2522bc979690325e3a7ac SHA512 a23b315ae285d588e92178c7dcdb44a90d4b7e6a25c7063ac05cb96d7cb872f6808bc23c02594a44907c69498223f814d9c9cd5be4cc29bec3eb91e1513c8732 WHIRLPOOL 709908c9497ca25a23625cfbe29a96c936b0fc5ebfffcdff86a9b2f7ee79489da0093f950c7fabd446f0ca72ca4f528bdcfb743d014dd92c33b21e351007cd77
+MISC ChangeLog 12449 SHA256 66fb02ce056b783e094cee6bc7f9e0a67ae7e4b447ffbea7d8a65efcdae05794 SHA512 887ac9187c81412c56dee28d0891403f88c3145d509f0fbe56b530a91af04757dac956472732b1d9f84baa17f3e7f967a30a041784cacc4c47d798dd8b13d19d WHIRLPOOL 00d697bff799f8de5083d471707388642167670700eb5f043ce915011fc8e8b5d188ddc3676e5e73ec9c29f3a2a72913bda76a70c6bb9bbaf32c705e82750198
 MISC metadata.xml 161 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6 SHA512 22fe7471187a068f45de295adc5349f8f01d16d06562f8edfceb5dacb604d98b0e3cadc23f7d0b164f6429769b71961bc5d9088a41f1ca4a968e4be37ac6ef1b WHIRLPOOL 92db96c310438550f7073b19fb34f6d5d7e478b04b43bff8a2815374ce50c2fa7291018c4131d48face3f3f0a66e0a3d2a778c42550a1fbfedb386db48a4bf05
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU+TYcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU+0oAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNQY4P/21+vmhrBqFUgMDWWPKb2kGI
-UzI48MQzpHSbnHkGcl/1DSRIJvvpEbo6AfR9kzhip3KtnoE4P0+NPrmNL7kHVwI8
-J1DzwUijls67ihtk4I2HmZXfygySl2ReMpkHQJfaaFDXkEg+KwQm5ldtDHFpvBrc
-pqyAEaTjbvSAHDpy5+iMKefuaKgOpE4OnY3VgSieKiX1ldXFk520cuIYtz4OyHFK
-cFpKrpaEVOVDIyGBBgluqzgoZebo7Z1qJ2b4yIwYQ6d+AfDTr5Pd3MDTam4hZxaA
-rOVzP7LAVe8CAUD2OQKXWA5Oybk7MClpLcthuz65F4ufXiKEVwfrSC9KGDtBVW9/
-UbgYRnY1E4ijZeU57goMaoR/auy0982PVuI3wP1xlE5BD4NrwPPXHriymUi4FBAv
-5N1K5EqCPVgeWeZHyaQc5HYJaywug2v+rd0ZPqivCbtB6iro7IRpFQqCIksJ/eJE
-+2ClkR4Q35b93haeLf+z+MjJ+nyvv0TqybtksxgYE7s6/OMJw+3Xqy+R4mB2q35d
-hfSo7F9zYvo+E+AM5nOJ+2TigyDrqSRMoILbHuLu0U3ieE14gjTNfMCxb3p5fX26
-w7jwv9VndyrTwxe+jIC4IPd40an/kVBfQNFnJXkknL580tgNa+wKVh9Hwj0NiVEF
-acbZnZkiU02U+4htu98P
-=TiIZ
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyN5OEP/0f5fB2PIykixRdNkahbM0UA
+5+AynPUGcdmqp4ZIbbaqKHB6DzlRs72xzstxtVRCKwbpzrf12dAXSIJmHCkekN8D
+ym0rbxfSJuyHzZoPliDjMCGyJWJxSdpAfm4KjrU1BgCj83VAg2w/J7GpZ5KXa1EN
+jJx7Gf+vbecizd56arB61emfyu4rGA8+r1cQ57Dgj0W3CqkK9LCDQHi7wVcRm6Nv
+XfOdlL0TlxGhVv77BRjvojA/2L31/8H73Alhnovuw6NSwZT4E8ELoClqClI0dypQ
+9JrXcMEow7bRzG9fMWhW+iRFp6gLAME/anthsq4SrzuOYzQ9Gzjz7vCwMqF3WioJ
+wMnZg+Zy/YtHsCDo26E7oVq/CW0i9cBdQXJf3w4VZv6v6QpL0XJX7hBsMnHtXx+f
+FEXzijhKzah7MhfJxwI7roDQoGg1dKOVz25ErTlD0jYZKZyG6mUAmPgnxjW1euFi
++isO4nQY27nkCpEWjHn7Fxkd43azdi9plCyyzWAh4td/vGFqCp1Xqtt4vXmNicUN
+xGtTvPCvWj21HFdGQ93Bb25scaHJQZQGwFAUb2p5lsp+QtAS2WcURwEDgnd3ebCK
+2LkZXAK74v6X4RHMwVqPf2Lw3bwLfqVdiHoCjx9cwkaPm4i/4zBRD5K6rAbbGBbS
+t+AxIHTNpkZncx6fbJUG
+=al+D
 -----END PGP SIGNATURE-----

diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild
index fa65562d29d8746e2ed7d7828fe8d90c9a1588c3..1ee1646c0a9a23442fef225fbbb31c8fb020e2b7 100644 (file)
--- a/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r1.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/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild,v 1.1 2015/03/06 05:07:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild,v 1.2 2015/03/07 18:57:02 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -56,6 +56,10 @@ multilib_src_compile() {
 
 multilib_src_install() {
        gnome2_src_install
+
+       if use examples; then
+               emake -C "examples" distclean || die "examples clean up failed"
+       fi
 }
 
 multilib_src_install_all() {
@@ -66,7 +70,6 @@ multilib_src_install_all() {
        fi
 
        if use examples; then
-               emake -C "${S}/examples" distclean || die "examples clean up failed"
                find "${S}/examples" -name "Makefile*" -delete \
                        || die "examples cleanup failed"
                insinto "/usr/share/doc/${PF}"