Remove lz4-0_p106.ebuild pending a fix for incorrectly installed paths

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

4 files changed, 29 insertions, 71 deletions

diff --git a/app-arch/lz4/ChangeLog b/app-arch/lz4/ChangeLog
index ec5bf303027c..1a404729a4fa 100644
--- a/app-arch/lz4/ChangeLog
+++ b/app-arch/lz4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/lz4
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.6 2013/10/13 11:16:59 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.7 2013/10/13 11:33:59 ryao Exp $
+
+  13 Oct 2013; Richard Yao <ryao@gentoo.org> -lz4-0_p106.ebuild,
+  lz4-9999.ebuild:
+  Remove lz4-0_p106.ebuild pending a fix for incorrectly installed paths
 
 *lz4-0_p106 (13 Oct 2013)
 
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index d0890216ccfe..d22e2a1380bf 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,25 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST lz4-0_p106.tar.xz 129352 SHA256 a9a09c4ebb962995d10e7e4f7d9224aaa93f308899de18a414948a58e87b6f22 SHA512 8b2bafbf78be7c42831e264d7acdca12712c88369cecdb3aa4621c84bb6b450c372f5153f7c3939a5f70d5810c62b98993697397319d286a1bb51b1e4a6ecde6 WHIRLPOOL fc5bb47b73606b125d8e155365d1fe101083e68e684ffd6014440e0f1416f1f6ecc64b797083e6939bd3e8cd42018e46a1864ae4542160c96933a47df9421a42
-EBUILD lz4-0_p106.ebuild 1001 SHA256 921fddfa0af84bb5defbf5cca61594c08463e048bd4f547cfbf9d57ad36d26d9 SHA512 75a6fb0462651abfc29f19583cf74cac898d950c92623860cbe9b73af836507b96ad0a43e84dc91b5276675f6345fd42cc08a19527d2525735f53f80da72712d WHIRLPOOL 990b69449ed4a951c52c2f6e7f097079434704ba5abc140ef330eca1dd1d833ca3bc7b59111051adeaafbe59c6e1be59bb272c44843992d7dcab8ad93db7a854
-EBUILD lz4-9999.ebuild 999 SHA256 d327f8d2a864c9333f943bb7e3f1af4f7cd2b77979899822816fa85e38baa426 SHA512 6e0378947bb5f862728e9762ec491d546af996d8af01288eed1ec9f6a1c9a832ea8c52f5fdbd21110e1cdd31dc206a3018a928d0c75ac052afbc1dce13430561 WHIRLPOOL 8eb9de73a3ce83ed32b4ef8112a807bc1a85e9252bcbe9290318ed7245487e4ba5d2848671f2af4f436bdf471b04d2f28dfd6e4112b3c64e935a4adfb3633caa
-MISC ChangeLog 1169 SHA256 84757ba71b7b9a9dcdd45f5208d93f3318d974fb40c5211fa78b594b02b721e5 SHA512 9faf04705e2eb73787de0a2d5831d9b67287aff43a18222f73bb7dd502fe97d0eb0d44630590003ed70d9993f72e1924a0744514c28faa0a176f0904f76ec5f0 WHIRLPOOL 6be7811d1c617133a9b0673cca94c664545b6b4475c4881e27bb0fa6a4bab084f4368d8354d17d50ce9845758c0df70734a7d126a031f450a8c255ffd436f7d7
+EBUILD lz4-9999.ebuild 1178 SHA256 ec7984b42da5c3efa09c2b9830100d679c32b10db0c86ce9239fcd3ca9eaa061 SHA512 0fde5c0d9fa6d3f8582deed84f7380c58ebc59773411bc0afac4571fa1e9bc21eeba4194a94dc80aaf9c601ad27698e136ed667064ee69489aa9eea1a78bb94b WHIRLPOOL 5579661243568cef71e92277968d78d47b99463fef1f1e64b1900c4a5f0f4278ce48b3c6783efbd8d5a794fb72aca7f82b27bef0465e10f18457eefe5e2b130b
+MISC ChangeLog 1327 SHA256 fd7c16fe9e704cacbffc015243f3071a24b16207cab96a245a1db0aa15e0ba19 SHA512 b916c3cdb3dd07efd5fb1d9432029f66744f9865b14cac23231a420b13bc7aeb171d7c3161b0b238a158160cdfa5c26756e0b950eea3c915524a72c17d1c70e3 WHIRLPOOL 84d51acad8b09c43436806aa8643a0fd2425852811d964f62dd412ac1a2ef161b5fb8477a46be0f21a31872442ed3b095bab4d3d7c3207cbf7a9b1431bb23dec
 MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSWoD4AAoJECDuEZm+6ExkniUQAJWAQmfFKpdfkxeOKNVAcc4V
-9+nAsp6HKsxEqm0suQ8ggtDVa1p86jLBxyKr6QBtAXwDBJbYQvGKfzMUdBbNZzNp
-l6hKJJhjjwx0J65ZMIEtnCCRhxNXqH8cT+++8snsAbqQ8pnauiP/eYNNH+FOhIga
-nM1Pq4UZkPVljMXxnsFqfvhgjEQ694v+Yj+1XAZyy+K9rQ7qk9g8Q2y8QnWp9rMQ
-yHVarCeXH+Ewbg3pNtwkGmpM7DjVrSX5yIcPYEOzpQxZbpbZicDlQBrHUnZXnx/q
-c01wYLvQ7iU96POenz+HKONJzGCWQXkj/i6/ASDIE169I/jYuxk6uzAzpJtskbCw
-dS3Dk36EtK9N/sNMWodOTnSIq4rKWpueI0z6AP1Z02QFSA7oAkcdj8lGVky+72Mo
-gKIjmhiU1aCnMRzXGsnj6mY626bmmWi/fjlKHhIoN3gz9Hw7542onjWheUF4u/d1
-FVYoF8wzxQRtc79YCUuafIrV6dE0kdRmFEGI3M2yUQIuOqgbDHXgqYqZ2BuQNqwJ
-0ha7cNfOUh113KkPchRxrul4fMJOV53uoXzAd5uRTFz9MCLCw3kzXcUVlRNwenWh
-NiUd/DyUCUCN3SZ3P+PyRgWsAQxRcU4Yd6mkUyE/CPZLLpWBaKQNrbNRPD3IHzn1
-jsr8re50ad+jNL2wxCCH
-=jv/k
+iQIcBAEBCAAGBQJSWoT1AAoJECDuEZm+6Exk0bAP/0uKrLwJz6YwzY/hSqoEGGRk
+JWJrioEY7FRdWQ2ZQ79UOA1ejCcpU45KXe63UYafYbdluk2IdQgDEKyqbCulAg9i
+tekiVl9sU1HObzFVaBBYpsFf21wo9GVvhmRn4oZdllMjChB4Uj66WFM8GmQJFbYI
+AFTLt3hManBJ04Tp5BapOtcnRqqliR+BH/0NHuYjdcopWq8sprK9b09vlUCHkv9A
+s6cbcfdAHxxONxQj8UOmHjg8eC7Vb6HtCmgKjq0KA4toyHRC8I7CnBhk1SjSP0JR
+umpB7Er0qFWUSY/AigTkkgwgsIX6gNoukV/bsYdQgBizLZC7mGgAZb0xvFD2BmEl
+fooNBvXC9o+E02x7+lbU6jOoyvD3Jy7SPVvoA1fE+6k56/OhodBOMybLuR8OJZlG
+h0Tsb7Ra6Q9pSd2hmw7cMgOUwV+zVJMg0jjng8u2B+yV4v2pvZCFHu3XR5+M5Z8P
+E8+K3aEtvcd7wqUvlLuVPiit0IhTK1Agny4zppWarcNCNQUgGA6FEEi2dGIjcQeb
+Gc48z5PXzF5xHe8ozGW+ertqCTJ6s7nvz6OdurVyi+QwbYRwQJ6bMBCP2AgStdd7
+ffzZO5m27TlDBRjcM9PzFJQKWv/I//ecMFJsV99eMRks7W5ORJ5j7m4AeHWE9Nzm
+VEXvxgcotqxVORrpHQwB
+=Z29/
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lz4/lz4-0_p106.ebuild b/app-arch/lz4/lz4-0_p106.ebuild
deleted file mode 100644
index c5af6c033c6c..000000000000
--- a/app-arch/lz4/lz4-0_p106.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106.ebuild,v 1.1 2013/10/13 11:16:59 ryao Exp $
-
-EAPI=5
-
-inherit cmake-utils
-
-CMAKE_USE_DIR="${S}/cmake"
-PREFIX="/usr/bin"
-
-if [ ${PV} == "9999" ] ; then
-	inherit subversion
-	ESVN_REPO_URI="http://lz4.googlecode.com/svn/trunk/"
-	ESVN_PROJECT="lz4-read-only"
-else
-	SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://code.google.com/p/lz4/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	[ ${PV} == "9999" ] && subversion_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(-DBUILD_SHARED_LIBS=ON)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if [ -f "${ED}usr/bin/lz4c64" ]
-	then
-		dosym /usr/bin/{lz4c64,lz4c}
-	else
-		dosym /usr/bin/{lz4c32,lz4c}
-	fi
-}
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild
index cf534c118cac..ed4bd3bbf2fa 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2013 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.6 2013/10/13 11:16:59 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.7 2013/10/13 11:33:59 ryao Exp $
 
 EAPI=5
 
-inherit cmake-utils
+inherit cmake-utils multilib
 
 CMAKE_USE_DIR="${S}/cmake"
-PREFIX="/usr/bin"
 
 if [ ${PV} == "9999" ] ; then
 	inherit subversion
@@ -39,8 +38,15 @@ src_configure() {
 }
 
 src_install() {
+	dodir /usr
+	dodir "/usr/$(get_libdir)"
+	ln -s "${ED}/usr/$(get_libdir)" "${ED}usr/lib" || \
+		die "Cannot create temporary symlink from usr/lib to usr/$(get_libdir)"
+
 	cmake-utils_src_install
 
+	rm "${ED}usr/lib"
+
 	if [ -f "${ED}usr/bin/lz4c64" ]
 	then
 		dosym /usr/bin/{lz4c64,lz4c}