Update the live ebuild to conform with changes upstream. Fix the src_install() lib hack to handle $(get_libdir) == lib safely.

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

3 files changed, 33 insertions, 22 deletions

diff --git a/app-arch/lz4/ChangeLog b/app-arch/lz4/ChangeLog
index c9cd84476db5..e7a25cee61aa 100644
--- a/app-arch/lz4/ChangeLog
+++ b/app-arch/lz4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/lz4
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.13 2014/02/14 19:13:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.14 2014/03/02 15:23:50 mgorny Exp $
+
+  02 Mar 2014; Michał Górny <mgorny@gentoo.org> lz4-9999.ebuild:
+  Update the live ebuild to conform with changes upstream. Fix the src_install()
+  lib hack to handle $(get_libdir) == lib safely.
 
   14 Feb 2014; Markus Meier <maekke@gentoo.org> lz4-0_p106-r1.ebuild:
   add ~arm, bug #499468
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 9590ce1ffb51..2d65483b224c 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -5,13 +5,25 @@ AUX lz4-0_p106-cflags.patch 630 SHA256 fa5a2e429ff7bfc5ff3fd02e5e8078d44f7c704c4
 AUX lz4-0_p106-install-to-bindir.patch 2141 SHA256 3799ef8a56f5cbeecd5f6ceb8716454990087965136322ccd99c6911e60dc924 SHA512 853be770173b46188c4f293f13c263053fd3837c23e959b2d19e36c5d3c8c04798b619224fe02b20f414494baf4db4235b7c223ce665b9b90f14a655c8303f8c WHIRLPOOL 6aac55ec15e8b82a16b06faa50bcb362ace5100bab3788d81ed3618f6efae787664855db14bd0f5393624647d13df40214f873ee7da24d505f9aa4fb371bcdf5
 DIST lz4-0_p106.tar.xz 129352 SHA256 a9a09c4ebb962995d10e7e4f7d9224aaa93f308899de18a414948a58e87b6f22 SHA512 8b2bafbf78be7c42831e264d7acdca12712c88369cecdb3aa4621c84bb6b450c372f5153f7c3939a5f70d5810c62b98993697397319d286a1bb51b1e4a6ecde6 WHIRLPOOL fc5bb47b73606b125d8e155365d1fe101083e68e684ffd6014440e0f1416f1f6ecc64b797083e6939bd3e8cd42018e46a1864ae4542160c96933a47df9421a42
 EBUILD lz4-0_p106-r1.ebuild 1328 SHA256 446d4545e3c1e74045110142816b87559af1ff6ce4c7cd85abd4af145a68887f SHA512 499180b0343278b990bdb5cbd3e21b332ce677d97db22d2707f2e5d2d14db271cbda564e5bc92d8b1167daf81343de6943a53086b98df87920dc80b254e72e90 WHIRLPOOL 86e67e14ffa9ff71674aaef504da29abe18d123f9636e65f08448d178bb9722f3ffde5a74035aed8af52bf96b028585d4be35f94fbc274a238648e7e4b7dc1e2
-EBUILD lz4-9999.ebuild 1234 SHA256 485148f4c8bf3c23492398cd73cbfc1837c5199b33b90161521a9bf8fabddd43 SHA512 6aa4a354a6ca7fad93384dd66eda4126ad6351f01273bb215dd0de90ca6c711a0d4c9905116d1c31ff491f46d5261f0a77b9c4c4bacf71e0e27adfc32b18a714 WHIRLPOOL 970078089485e96d8967a2a9087cd287bc4e0895c5e2d46fcd258fae6e9e8e3b2b89e05d6eb78ce65148f35f299a2d278e604227480314724601c19312d9890b
-MISC ChangeLog 2242 SHA256 792a59274ecb0288540d86e566549bb4d3a68b3a9b35439301b5a29c16fe2e28 SHA512 e3fdbb79135f661776e60761a2c83826d3ebebfd20f2858360c42fe2b68ea083398f3eaad3ca423eaa6dfe998d14c46e150cc4f812439a2eccc5d9bf2b56eb86 WHIRLPOOL 346b8a7e8de6244e143d77778814698d2304391f9679fd859122de0d08496034b61e2f51aa0884441ec2d720a7ea5d197df57e4213aec9278ff4e4df8077430a
+EBUILD lz4-9999.ebuild 1152 SHA256 09706e4b88870b5dda5bcc7b8c0760028e46f16d779fb9ff5a9547a80f92361d SHA512 1ebd2361c9c23b586de919170c728bbc5d624bbfa55d0342deafcb4604181945bda81e941876dfdcbd1ece2c6e16ea8cb62c9f260df188a20991197f9432c9e7 WHIRLPOOL b171b3c0fed3881bdf74d44ce271381eb740130e3b3cfe57af7c08421ff8367701982c3fab8c27373c443228835800ad087fadd9e4b5f55231d491f350415c97
+MISC ChangeLog 2441 SHA256 c05d4243d9b1dd887d9c19ff747d2131d13fee63d008730d7d2afeff685226cf SHA512 1b6f1dcb2aae7f8eb4a0c7cf53573ce6ec972bacbbcdfd096e49952e270eeaa776ac11544697685e3a89d71ef0166315a6ceabd4c76bb19a275e2aab9357bd40 WHIRLPOOL a10c5a06289829e5f97ee8c23ffa2b315835560c189962ff97a781091519eaf53e4c26cb36e915980254b19c1f482ad41389e4320bc8ae975fdef90fa028d6e9
 MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlL+bJUACgkQkKaRLQcq0GL0JQCgqBNohKVWI9PYc18gpZY+RLY9
-f1oAn3eutf44WcJ/k17neCUCajPK0wXa
-=TxYO
+iQJ8BAEBCABmBQJTE00HXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOfJ4QAI+9YTHmIO4xc2Wwy2Slo7Kl
+paqGiwWD+eC0QgSbboDHmCnLI+L8nTGT5lIU4LfdIw9yL97/CQNiBV4jicyqPcBe
+8TaDSwlPDH37UOJC6VITv0tKwLPU0YoGSKG9h4/xS0F9jjdqEE5+s9Qr0PiDuL3B
+LDApzNf/eorlwEQt3joKaBljNaA/gfSZGx2h3lNuu/fAK9d3MY3k4F8ZQ/7xaXnt
+LGPwY7Q3B2ZbPxjFCtOigy7HoNuiTqZMm2Ro2KFkXgfgge5RxAUVMy9ueRN0IQt+
+zMrF/tMEUAmB4f0vKz76gPP7QhWdTFHGDmMsMb1IrcplLusi8fyLPWBjpAZQPYvf
+0i5ytX9CU/bFdyaO1YANyri7RLRwH19iJEviITjbzZmaUJxtLKXKJwaL4HXKXoSb
+jxrH/ld+mhcYwaPwr1P3wyGmryZkBHOlLWvxTA9oASs19g//DA1jmZpcbMj+7iih
+JOTSYXdNY60+EXqddztR80oPtswzNwemvWi8vHfdbA33S7qXNFssnudnQyNx/FM8
++j9JJlyTsCsxKWsiVUWUCTzLRCo8waAJ8Y6RR/2wEf7E8opKDlGQCEZMXD7UKBu9
+h4w1LHcIMd5OIGHuzM3mxxiSfiUkwRcqHxHsTjAchZQ7l4tQrutmLCduLvINa2Cf
+JPWvH61Zhm/na2IAAlic
+=Eug+
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild
index 40a2cd2c29da..840dc3ec8e35 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.8 2013/10/13 12:13:49 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.9 2014/03/02 15:23:50 mgorny Exp $
 
 EAPI=5
 
 inherit cmake-utils multilib
 
-CMAKE_USE_DIR="${S}/cmake"
+CMAKE_USE_DIR="${S}/cmake_unofficial"
 
 if [ ${PV} == "9999" ] ; then
 	inherit subversion
@@ -28,7 +28,7 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	if [ ${PV} == "9999" ]
+	if [[ ${PV} == "9999" ]]
 	then
 		subversion_src_prepare
 	else
@@ -38,24 +38,19 @@ src_prepare() {
 }
 
 src_configure() {
-	local mycmakeargs=(-DBUILD_SHARED_LIBS=ON)
+	local mycmakeargs=(-DBUILD_LIBS=ON -DBUILD_SHARED_LIBS=ON)
 	cmake-utils_src_configure
 }
 
 src_install() {
-	dodir /usr
-	dodir "/usr/$(get_libdir)"
-	ln -s "$(get_libdir)" "${ED}usr/lib" || \
-		die "Cannot create temporary symlink from usr/lib to usr/$(get_libdir)"
+	if [[ $(get_libdir) != lib ]]; then
+		dodir "/usr/$(get_libdir)"
+		dosym "$(get_libdir)" /usr/lib
+	fi
 
 	cmake-utils_src_install
 
-	rm "${ED}usr/lib"
-
-	if [ -f "${ED}usr/bin/lz4c64" ]
-	then
-		dosym lz4c64 /usr/bin/lz4c
-	else
-		dosym lz4c32 /usr/bin/lz4c
+	if [[ $(get_libdir) != lib ]]; then
+		rm "${ED}usr/lib" || die
 	fi
 }