diff options
author | Richard Yao <ryao@gentoo.org> | 2013-10-13 12:13:55 +0000 |
---|---|---|
committer | Richard Yao <ryao@gentoo.org> | 2013-10-13 12:13:55 +0000 |
commit | c84608926e408426376f7ac46cd8b55a7e7050e9 (patch) | |
tree | 5cd77426629e716d03d2c825bc091d814129cc09 /app-arch/lz4 | |
parent | Add missing depend (#476134) (diff) | |
download | historical-c84608926e408426376f7ac46cd8b55a7e7050e9.tar.gz historical-c84608926e408426376f7ac46cd8b55a7e7050e9.tar.bz2 historical-c84608926e408426376f7ac46cd8b55a7e7050e9.zip |
Introduce app-arch/lz4-0_p106-r1 to replace short-lived app-arch/lz4-0_p106: Path issues are fixed; app-arch/lz4-9999 has been synchronized with app-arch/lz4-0_p106-r1
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64
Diffstat (limited to 'app-arch/lz4')
-rw-r--r-- | app-arch/lz4/ChangeLog | 11 | ||||
-rw-r--r-- | app-arch/lz4/Manifest | 33 | ||||
-rw-r--r-- | app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch | 51 | ||||
-rw-r--r-- | app-arch/lz4/lz4-0_p106-r1.ebuild | 61 | ||||
-rw-r--r-- | app-arch/lz4/lz4-9999.ebuild | 15 |
5 files changed, 150 insertions, 21 deletions
diff --git a/app-arch/lz4/ChangeLog b/app-arch/lz4/ChangeLog index 1a404729a4fa..eea2ea0b1691 100644 --- a/app-arch/lz4/ChangeLog +++ b/app-arch/lz4/ChangeLog @@ -1,6 +1,15 @@ # 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.7 2013/10/13 11:33:59 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.8 2013/10/13 12:13:49 ryao Exp $ + +*lz4-0_p106-r1 (13 Oct 2013) + + 13 Oct 2013; Richard Yao <ryao@gentoo.org> + +files/lz4-0_p106-install-to-bindir.patch, +lz4-0_p106-r1.ebuild, + lz4-9999.ebuild: + Introduce app-arch/lz4-0_p106-r1 to replace short-lived app-arch/lz4-0_p106: + Path issues are fixed; app-arch/lz4-9999 has been synchronized with app- + arch/lz4-0_p106-r1 13 Oct 2013; Richard Yao <ryao@gentoo.org> -lz4-0_p106.ebuild, lz4-9999.ebuild: diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest index d22e2a1380bf..17c848fcaaa5 100644 --- a/app-arch/lz4/Manifest +++ b/app-arch/lz4/Manifest @@ -1,23 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD lz4-9999.ebuild 1178 SHA256 ec7984b42da5c3efa09c2b9830100d679c32b10db0c86ce9239fcd3ca9eaa061 SHA512 0fde5c0d9fa6d3f8582deed84f7380c58ebc59773411bc0afac4571fa1e9bc21eeba4194a94dc80aaf9c601ad27698e136ed667064ee69489aa9eea1a78bb94b WHIRLPOOL 5579661243568cef71e92277968d78d47b99463fef1f1e64b1900c4a5f0f4278ce48b3c6783efbd8d5a794fb72aca7f82b27bef0465e10f18457eefe5e2b130b -MISC ChangeLog 1327 SHA256 fd7c16fe9e704cacbffc015243f3071a24b16207cab96a245a1db0aa15e0ba19 SHA512 b916c3cdb3dd07efd5fb1d9432029f66744f9865b14cac23231a420b13bc7aeb171d7c3161b0b238a158160cdfa5c26756e0b950eea3c915524a72c17d1c70e3 WHIRLPOOL 84d51acad8b09c43436806aa8643a0fd2425852811d964f62dd412ac1a2ef161b5fb8477a46be0f21a31872442ed3b095bab4d3d7c3207cbf7a9b1431bb23dec +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 1239 SHA256 496b53f304901209a6e676e43175bb5d845186b62308f9c95bcaff1042fd7872 SHA512 18a8beed528007a516d12cf7556cb25e2598f32d1c659acc08e055763d1306af5732600c956eb1399e904c9e71b7a18ccca1d1cf6948bbd505e2c21663f72ec1 WHIRLPOOL c3dad5dcf3a81d2912520a217c854200f9e76f17c68e6a0dbb174e87abe1cd794381fe04f956b9d4bf78e6025052d436f19258b927ced880272935ded0d2bd31 +EBUILD lz4-9999.ebuild 1234 SHA256 485148f4c8bf3c23492398cd73cbfc1837c5199b33b90161521a9bf8fabddd43 SHA512 6aa4a354a6ca7fad93384dd66eda4126ad6351f01273bb215dd0de90ca6c711a0d4c9905116d1c31ff491f46d5261f0a77b9c4c4bacf71e0e27adfc32b18a714 WHIRLPOOL 970078089485e96d8967a2a9087cd287bc4e0895c5e2d46fcd258fae6e9e8e3b2b89e05d6eb78ce65148f35f299a2d278e604227480314724601c19312d9890b +MISC ChangeLog 1665 SHA256 41da65d532eab26a7d0aa823110d403436c6272d2015c400d9306ec9822e2b0e SHA512 31609c831f51d99fe45e31ea9a89d6ec48e103d9a758516cc16bd8062c685a208d5f601df363b3f1e0295f71ae43bfd93bf46fe2c06b339c20e792f200416703 WHIRLPOOL 31bd8a2171d41bb7d2ef1b76177c6566a115937f375496aa7a4b18101822f58b3a06dc6e2b58542e7793272e94102cba162e26168135776facc656d2b16ca83d MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -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/ +iQIcBAEBCAAGBQJSWo5LAAoJECDuEZm+6ExkRKQP/0UmewEx6M0FLwKuVfbX252O +kqAEb2RkbP5oydGaoNtpjJ0BjwTZU7qFDZfyl6j3IYetOlUc2RCHBQNz4Gb3AgWP +00nxdRi+s6cilkxfnv1xAhn/IQrhZdMntG8FyHxv+ZZf/h5C54j3i3H8PKy0kU9J +KssUF8M8rfRVVK30Ci0KZObQCvpt+ArRnPMNtUBA+ts/qyIayQLf75WYaT/RHwwj +ELRTAdnWWQO0wf9e932R+iWObFGH1RENXu4Aiq/smDhchNlufpeWnHQ88XPctkjB +6ZFXh2+S8BPHzHOLpezMbePSrKS8iDabPLZqyUYFzMfiwEwse8bBKiy7ygqr8zhC +Lu4GS4K+hoBGPvR2kg7JFQGXcRJT1vMBI2shlQVUEhdjWqffX/3b63wL1tyrB9v9 +7VYXo3XEiODbwUPYyl5Ea18973xsMn5hNZGOyMhb63llTNWsi3VEqLt93fb+LNO7 +fxNnlKF9CcWBrej3A++GuXLyJ8dgsZWcsJoDobCuUMq9Ifs/tpaz0WR/3ORbhAlq +wMhgXfEosF4OykkV6ly2MJhkcV6PDyEscqlVk/u57R/drwH3fTarXN5d+V+syBW7 +8aWjr5oqpSNS/Svq3ObD/4oP7u+HQb7wTHR+q7Cxn5Ly9FipRPIsxrnMZmNQtQoJ +h2uRMCBWG/vOoXKpIym4 +=Fndf -----END PGP SIGNATURE----- diff --git a/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch b/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch new file mode 100644 index 000000000000..521b1bfc58d2 --- /dev/null +++ b/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch @@ -0,0 +1,51 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 496c076..ce3fab1 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -41,11 +41,11 @@ endif() + if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
+ message(STATUS "Build 64bit executable binary")
+ add_executable(lz4c64 ${LZ4_SRCS})
+- install(TARGETS lz4c64 RUNTIME DESTINATION "./")
++ install(TARGETS lz4c64 RUNTIME DESTINATION "bin/")
+ if(NOT BUILD_SHARED_LIBS)
+ message(STATUS "Build 32bit executable binary")
+ add_executable(lz4c32 ${LZ4_SRCS})
+- install(TARGETS lz4c32 RUNTIME DESTINATION "./")
++ install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
+
+ SET_TARGET_PROPERTIES(lz4c32 PROPERTIES
+ COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+@@ -53,7 +53,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit") + else()
+ message(STATUS "Build 32bit executable binary")
+ add_executable(lz4c32 ${LZ4_SRCS})
+- install(TARGETS lz4c32 RUNTIME DESTINATION "./")
++ install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
+ endif()
+
+ if(BUILD_SHARED_LIBS)
+diff --git a/cmake/pack/CMakeLists.txt b/cmake/pack/CMakeLists.txt +index a9b0557..e85416e 100644 +--- a/cmake/pack/CMakeLists.txt ++++ b/cmake/pack/CMakeLists.txt +@@ -48,16 +48,16 @@ set(FUZZER_SRCS ${SRC_DIR}lz4.c ${SRC_DIR}lz4hc.c ${SRC_DIR}lz4.h ${SRC_DIR}fuzz + # EXECUTABLES FOR 32 Bit and 64 versions
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
+ add_executable(lz4c32 ${LZ4_SRCS})
+- install(TARGETS lz4c32 RUNTIME DESTINATION "./")
++ install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
+ SET_TARGET_PROPERTIES(lz4c32 PROPERTIES
+ COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32 -Os" LINK_FLAGS "-m32")
+ endif()
+
+ add_executable(lz4c ${LZ4_SRCS})
+-install(TARGETS lz4c RUNTIME DESTINATION "./")
++install(TARGETS lz4c RUNTIME DESTINATION "bin/")
+
+ add_executable(fuzzer ${FUZZER_SRCS})
+-install(TARGETS fuzzer RUNTIME DESTINATION "./")
++install(TARGETS fuzzer RUNTIME DESTINATION "bin/")
+
+ #target_link_libraries(lz4 ${LZ4_SRCS_LIB})
+ ####################### CPACK PACKAGING ###################
diff --git a/app-arch/lz4/lz4-0_p106-r1.ebuild b/app-arch/lz4/lz4-0_p106-r1.ebuild new file mode 100644 index 000000000000..648622f33092 --- /dev/null +++ b/app-arch/lz4/lz4-0_p106-r1.ebuild @@ -0,0 +1,61 @@ +# 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-r1.ebuild,v 1.1 2013/10/13 12:13:49 ryao Exp $ + +EAPI=5 + +inherit cmake-utils multilib + +CMAKE_USE_DIR="${S}/cmake" + +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() { + if [ ${PV} == "9999" ] + then + subversion_src_prepare + else + epatch "${FILESDIR}/${P}-install-to-bindir.patch" + fi + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=(-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)" + + 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 + fi +} diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-9999.ebuild index ed4bd3bbf2fa..40a2cd2c29da 100644 --- a/app-arch/lz4/lz4-9999.ebuild +++ b/app-arch/lz4/lz4-9999.ebuild @@ -1,6 +1,6 @@ # 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.7 2013/10/13 11:33:59 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.8 2013/10/13 12:13:49 ryao Exp $ EAPI=5 @@ -28,7 +28,12 @@ DEPEND="" RDEPEND="${DEPEND}" src_prepare() { - [ ${PV} == "9999" ] && subversion_src_prepare + if [ ${PV} == "9999" ] + then + subversion_src_prepare + else + epatch "${FILESDIR}/${P}-install-to-bindir.patch" + fi cmake-utils_src_prepare } @@ -40,7 +45,7 @@ src_configure() { src_install() { dodir /usr dodir "/usr/$(get_libdir)" - ln -s "${ED}/usr/$(get_libdir)" "${ED}usr/lib" || \ + ln -s "$(get_libdir)" "${ED}usr/lib" || \ die "Cannot create temporary symlink from usr/lib to usr/$(get_libdir)" cmake-utils_src_install @@ -49,8 +54,8 @@ src_install() { if [ -f "${ED}usr/bin/lz4c64" ] then - dosym /usr/bin/{lz4c64,lz4c} + dosym lz4c64 /usr/bin/lz4c else - dosym /usr/bin/{lz4c32,lz4c} + dosym lz4c32 /usr/bin/lz4c fi } |