Add app-arch/lz4-0_p106 (snapshot of upstream r106), which is initially keyworded on ~amd64 (additional keywords welcome); invoke cmake_src_prepare() in src_prepare()

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

4 files changed, 92 insertions, 26 deletions

diff --git a/app-arch/lz4/ChangeLog b/app-arch/lz4/ChangeLog
index 2b3ad91dab4d..ec5bf303027c 100644
--- a/app-arch/lz4/ChangeLog
+++ b/app-arch/lz4/ChangeLog
@@ -1,6 +1,14 @@
 # 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.5 2013/10/13 10:54:32 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.6 2013/10/13 11:16:59 ryao Exp $
+
+*lz4-0_p106 (13 Oct 2013)
+
+  13 Oct 2013; Richard Yao <ryao@gentoo.org> +lz4-0_p106.ebuild,
+  lz4-9999.ebuild:
+  Add app-arch/lz4-0_p106 (snapshot of upstream r106), which is initially
+  keyworded on ~amd64 (additional keywords welcome); invoke cmake_src_prepare()
+  in src_prepare()
 
   13 Oct 2013; Richard Yao <ryao@gentoo.org> lz4-9999.ebuild:
   Fix build regressions
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 26e7c305a2bf..d0890216ccfe 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD lz4-9999.ebuild 849 SHA256 30777e2a89430820795352d8cabc66d8f9d28167d0ea703d44a3867a858da4e2 SHA512 b79f57cc340a2a074097c590f01c9de6ad1751b128c1af3eb6457ad43862a4500f8ea47ac1fc4474b48b26c0aa20afa96c4b2a559973740c92966932d0de5e19 WHIRLPOOL 40c60622dba835039fa1800e11855151985618d0402356231bfa603dacd22484fca1302abed942d13753d60cc46feb15c0b6bb52fae5f6b1316faad679b456dc
-MISC ChangeLog 884 SHA256 8ba67840b2ee24c08297c2ad28872c6bb83c4f273a54242163bd51d90caccfd8 SHA512 3f78a8cd2a85c9e8b8f7d2b683ea33374a7397df3e9f1d239305893a3bdadb53d3a267e4128643e6b841e7f5b948c66efdad5a3549cde0b80e233b9fa90195e1 WHIRLPOOL b85628674af0092b86b2d30037d7e0154123f4ba7fe61eb00fbe0b7c4956c1e7b7412843fe5b2b8300b867a139c8e576e575c359dc495175738f639c219b6a09
+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
 MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSWnu2AAoJECDuEZm+6Exk9YYP/1EFyf8kGYcicupga7uagCu9
-l5m9Ls+iZQ6NTbuA2jFfM9PtkFLCS4fImm72NrUcgqI2d7DCTaPRVLOrtKBn42bE
-ddeRGYEV+8EEIZuSwMWFzCqTy6+Oc5AS1ote8EiKHFgttqWaowpC2crRZdl1iYDN
-fdatdp9OPVrFwVsyrFaIx0eXw+9JmXZP/wQ1SZVkrUA/fNMQmACeVQtN/WXoNS/C
-fpP1OnGCCotDDVqV+3ja0XsvhcDlsATiWSTGvfaORC9tZuiOGjnbtZOzn/SPo2zm
-RuT7RBoSkAJf0yMuZMi0tNxHnOnkmnTpraCFZQkYw1jzS+KrGiUR3EJ9k/c16SGf
-FOzltKbQ5wr1mfvJI+/zl5y2Dm+wL2aUHNK2ZSzLdP+8O5udPlQxSAaVTOn4RTE4
-Wb7fabsuJ+TRURk9mHuhadzwZHd8P07VJB76Z9ibTYMCuGI6x7Av/xUbMG7EKk4F
-49BhqbeJzThDxc+x3kT8S+mgc1PzbE0++N/amhZQocSSbC6fNf2nPIKXf/UXT8ms
-aDJUHTBybjBKI+kIiB5Llcldh66hikSgHryZ/3bCUQyHYtTULYlNkp+TByqmdS45
-gzEDJ9wR5Ypz9BrkeqxWJgErRg2ji36RHaCgtVuxGq0cZElUGAuEfrRmfenpA8iB
-f/SEcN+ZSGnTGZkahPpC
-=5ifu
+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
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lz4/lz4-0_p106.ebuild b/app-arch/lz4/lz4-0_p106.ebuild
new file mode 100644
index 000000000000..c5af6c033c6c
--- /dev/null
+++ b/app-arch/lz4/lz4-0_p106.ebuild
@@ -0,0 +1,50 @@
+# 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 6bbe04ce1552..cf534c118cac 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-9999.ebuild
@@ -1,30 +1,36 @@
 # 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.5 2013/10/13 10:54:32 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.6 2013/10/13 11:16:59 ryao Exp $
 
 EAPI=5
 
-inherit cmake-utils subversion
+inherit cmake-utils
 
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://code.google.com/p/lz4/"
-SRC_URI=""
-
-ESVN_REPO_URI="http://lz4.googlecode.com/svn/trunk/"
-ESVN_PROJECT="lz4-read-only"
 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"
-KEYWORDS=""
 IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	subversion_src_prepare
+	[ ${PV} == "9999" ] && subversion_src_prepare
+	cmake-utils_src_prepare
 }
 
 src_configure() {