Fix creating libLLVM-3.4.so compatibility alias.

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

3 files changed, 29 insertions, 19 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index f9cfecb140a8..2e52f12b2136 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.195 2014/05/10 10:06:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.196 2014/05/10 22:32:59 mgorny Exp $
+
+*llvm-3.4.1-r1 (10 May 2014)
+
+  10 May 2014; Michał Górny <mgorny@gentoo.org> +llvm-3.4.1-r1.ebuild,
+  -llvm-3.4.1.ebuild:
+  Fix creating libLLVM-3.4.so compatibility alias.
 
   10 May 2014; Michał Górny <mgorny@gentoo.org> llvm-3.4.1.ebuild:
   Bump subslot since library name changes anyway. Unnecessarily.
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 1d613c36dc19..4ff4472529da 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -59,27 +59,27 @@ EBUILD llvm-3.3-r3.ebuild 14172 SHA256 c005ac1508cd6a2b9998be4e22f82567a6b0bd0ca
 EBUILD llvm-3.3.ebuild 6798 SHA256 4e53042e76ce97e6a460cda74c5dbadc1cee9009345e8f0232e28d53c8f77579 SHA512 5513887c3b5a25a678713b68c216a40801ddecbf5a4dc58d7ad01c1ec8411589e20d8662c34f117e6d64924302504c8ce74b48f3edca1f292b56881eb6176271 WHIRLPOOL 79d6adefc281699477a271f76cb8eb7992d0946b6fcda9149a0976c30138ac882f735eff08c25c0edf37ccc8e31700f6d2d51d38c354c82c06695962e8f9243b
 EBUILD llvm-3.4-r1.ebuild 14752 SHA256 c8abcd0a512c2d217e6be7cd01f04f937f9308edb148d9b9f507a3377122fcea SHA512 f6e1fcd7b6983410ff3ea5338218990959b56734f7ab016f7eedbbb13894afd7d4666a1f273605c20701c633d832ca3c792f820d0f511945777f34d1c556c527 WHIRLPOOL 8389f922d18c46576b71d2a908607595b62f1652abeaa55eae8807fa056d8c67078a62ed8962ffe95f7489e1c96abb91a18e69616a6c2546e61191032fecd5c1
 EBUILD llvm-3.4-r2.ebuild 14631 SHA256 6f431774014c184da35a23c2ff810be515a04dfb169136ec7cf24c6e853f36e5 SHA512 a1adbbd6cb7c478f76d764311bf47e2b77fb298708e20df93f5678bd2ecbbe8a1623f89e97c5a4d88f18981d8f3e2d575355ce1b57607887c5e8cd6df52ec6b1 WHIRLPOOL a5343138214dcbbb61c3c06d8e405cb5ecb690eafd6a90a7f6d1d20a00db0a82d703aeea6f0db81ccfb312ca9c19c6c958c368ada2ead2369e2d6cd46fee1f5a
-EBUILD llvm-3.4.1.ebuild 14750 SHA256 56d56d3fc2ee3b22e97ca1a3010b1f620b69eea0cfd623255cc97bf70b795d97 SHA512 26ca426148817b7c5d23709986bb726a25498f54d0855108ccbaa14ea893d57e924898840295aeed2bb3e6cff673f064555608abd800b1439bf508293a14fbdc WHIRLPOOL a6ca65410614dfb4823949eb3eeca6ce451886946b4c3f7863c9ad25d2dfa6fae0eb6957cca68ea1866f402e77cb99fc88083af5053a1ed019c3d4d2bf775c34
+EBUILD llvm-3.4.1-r1.ebuild 14874 SHA256 fb0036f7a51eccbfb8a7a0db9059001e6fea00707f4023828a920f526b3c673a SHA512 8b9cb5f38b2ad30f17ef5733ea0f37b19ef069475dff588a268616c7c1c31d0ad81c63d8763e388a6198c9b25c3d18a7954bda73f9fcfd171e6fb63d258a6b25 WHIRLPOOL fa30c98aea48bdc1b915d8411f052d419cc38f6ccecec65382a7d37e662e31c2722a58c7829c4f7dafc23419b64f18adfda2ca1ae4355f7a430479cfbf8ab1a3
 EBUILD llvm-3.4.ebuild 14465 SHA256 19b938c427741e2d3c70ff5df6c3545082656b73e419d60ba748ea8e82b09996 SHA512 035d16012bf0aa46646797fcc6fbde45b43255fdd0fd8f2b22bd63e88293625f530c0181a7982ca8c531e6068f26d74f75c77485959457c4a10037eb7d7c886a WHIRLPOOL add1c9e6355bf949f992f96ee5bb596666565701739cda96116e93c164760b162a6cfcf3920e58322a2d16201d74d4315511b4a5b5422015e20d154285e4505b
 EBUILD llvm-9999.ebuild 13012 SHA256 c39f0fd55460f8e6d75260010f0d62c06d1f2f270017f56e385954d9b4a4d536 SHA512 1c29299eff893525ac76d102774c5e8bf664091dbf798adf69f687d579b183195911aefc8cf2e56a85be3ad85082870620fd8c46632c0338b21b72b71ccb8f42 WHIRLPOOL 610a773803cdc6674a4af47f1a6ea6392191926123f7a16af69379e97e3793072e6f4f72e8922722b91be214c70b4f0d7ba0b474eff52290cbca6d04716674f3
-MISC ChangeLog 32536 SHA256 bd93e58ebfd7a26250978feadfa3ba00fcdeb4797f666d17feb88f7e82f240ff SHA512 0ced24b3564e7583ffb47a4a9bb0f3c34837b77768ac4084be66cbc7a181938b2383a210b8f97da22c1d8af82bb7cc066a2cd8f7bdbc3ad3d8a0963e919879b5 WHIRLPOOL c90828da583b99c75cc3913e513a036dbaca506a86bb05550ea94d965e66f5965acb975b65044c3ce76bc7170d5bd15162c5dfe23752d5a4d3fb71caf49cafbf
+MISC ChangeLog 32713 SHA256 43cc54f6ab3fdf03eb852a9d43dcd8f00da9cb78aa35518d1b47b9d9fdd9eb46 SHA512 10242ad670086ddd41efeb487d6863f68facfad9b5a60b2b9fafaa7d4b8ad893cb91131a1c4b074cee3589df7735d1e0e5ce59c1614e74659970fe69bdb1aba8 WHIRLPOOL 58f535c44619ac20441845cc00934565b9f60d026dbd99266fe56af2d4e3ccf20b424406a4ec1f2cb97cc43dc9ed95f8f6b73086eb9b08e43e0b88cd9b2a3e8a
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTbfpDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTbqkfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9pkP/AyIxKtlU4dkDFDTafebWFVF
-GfHodRsoNo4gf9YpiwT9MQQUQTD740bTjrLYhlQ+7p4JSVkGmOV7Wb8kh/nhoAMa
-3bQrRkzlajsvP+sWg7x32lMgy2IGBH8NDS9s/N1528Y0TNh7AzvF2YPP7WTmB9WF
-wNd5wCmuGbk4e/dTL2ZIw1scqzHEcJli/QDB0MdOLL2XQB8faZEBlR9Wj8KDNl5x
-AO2zfOBNP+BqVenOJ0S3GHnKmgaerNSW2X1LmWKSdildOXsBTl8aUBXqr76psTSb
-QowqGnDiJRQCqIYB9HnxBIIOzMnzex3jCn0cV8ShHf52qMPrwTvIayglpEV3lX51
-wdu1FxRBNVXp2jnEVToy1MRkSL1JkwE0fOzueu/4lXM1sU+bH1Bs9MZ1WvOVuX5y
-Pp7o/Zb6e1FVzJab9ZOsd6yf4/LUdauECIdwX19VvyWby/lDugON5kHwcCDBju29
-PARPG8/+f7OXy9qXGxEZqcrDiT4ZY4MmQEz3sHkPeW10TU7GPqYP1xjlA75XmSJp
-QLXZiYxZV6slOC7NXcXZv6iT/jXP4/asVC+0CSHVIHljz9HQmGTuto79g/dAaVPl
-h2qkyLzLgr4lEbTKZP2FZmH2Jkarj0eGPjw8jP0SVR/WZXqjRI3FpxmG/SlcHtO4
-r0ETUhbQy0VnfBE6jmHO
-=vfvv
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOMf0P/2P/CQlHqS/rQ4C9zFAwhh6I
+54tc3K+TuNv5IEJyw2uh+7yC1zUUUlg9qvz4pav7TwennkeXVH3A3n4A6Mztxze5
+FDFf+nvyZUWw3doWgEk32ZzDuCTS8wPaWUjuUNiUw63FRJele8wOqs73ltIoJMax
+xrNpQoh87Rde7qqv9MceQBVZaAm2JmYb3GZnAKIMYNzPXvk44eQm/7lof6+A3EKA
+5ObhDEqFIusCh8nCbjelb22QSREwubViz69kAbTAGzPvIHPK0XqAjPEv6KNMVFt0
+X3qtl1Q1PsIlM/2wpdxkXDuaq6UuL0e00jnc6mLHC/bh0cMfzyB/VIyMBgM3kI1M
+6XTEUvJogmxq0yJf0bRA7u3uxYYHCJ+shW1+5xoTY5sbfzPFUuzfJriU2lHej2qm
+npBvH2piBE55p7ZTDAvtolch1ekbgseFMZQjvlzCf3ePBiTmlqhmvqnfTdLC+EHs
+l031ZpaPrqCfey6HnNCbmHU55O14L38DvJlTz2IMQShQHLxlEVh6vNgmmaBj46rw
+Vq1yetu+vlBPrVMfO/y5dTrI5LvtMYbyCy0xoFPSlrFHeXf211MsM1RF3Z/caxxt
+smXmj2p0mScisH4Th+KkIlHbBix7fTtpJeGogWNSQx66HfcRoJcw9AojxcVsP9zj
+XGaXiAblLvaWuM707Jun
+=4SIa
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.4.1.ebuild b/sys-devel/llvm/llvm-3.4.1-r1.ebuild
index d59bbdaf204f..0881ad16c441 100644
--- a/sys-devel/llvm/llvm-3.4.1.ebuild
+++ b/sys-devel/llvm/llvm-3.4.1-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/sys-devel/llvm/llvm-3.4.1.ebuild,v 1.3 2014/05/10 10:06:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.1-r1.ebuild,v 1.1 2014/05/10 22:32:59 mgorny Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz
 	!doc? ( http://dev.gentoo.org/~mgorny/dist/${PN}-3.4-manpages.tar.bz2 )"
 
 LICENSE="UoI-NCSA"
-SLOT="0/3.4.1"
+SLOT="0/3.4"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="clang debug doc gold +libffi multitarget ncurses ocaml python
 	+static-analyzer test udis86 xml video_cards_radeon
@@ -403,6 +403,10 @@ multilib_src_install() {
 	emake "${MAKEARGS[@]}" DESTDIR="${root}" install
 	multibuild_merge_root "${root}" "${D}"
 
+	# Fix broken alias.
+	ln -sf libLLVM-${PV}$(get_libname) \
+		"${ED%/}"/usr/$(get_libdir)/libLLVM-3.4$(get_libname) || die
+
 	if ! multilib_is_native_abi; then
 		# Backwards compat, will be happily removed someday.
 		dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}