app-arch/lz4: Clean old up
authorMichał Górny <mgorny@gentoo.org>
Mon, 1 Jan 2018 20:08:01 +0000 (21:08 +0100)
committerMichał Górny <mgorny@gentoo.org>
Tue, 2 Jan 2018 06:18:30 +0000 (07:18 +0100)
app-arch/lz4/Manifest
app-arch/lz4/files/lz4-0_p106-cflags.patch [deleted file]
app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch [deleted file]
app-arch/lz4/files/lz4-0_p131-static-libs.patch [deleted file]
app-arch/lz4/lz4-0_p106-r1.ebuild [deleted file]
app-arch/lz4/lz4-0_p120.ebuild [deleted file]
app-arch/lz4/lz4-0_p131-r1.ebuild [deleted file]

index fbbceeca7f9d827996a8dd12995705e7fd731768..cf5a2b31602a41d1b4a2d6c46b0c827dfe70ac67 100644 (file)
@@ -1,5 +1,3 @@
-DIST lz4-0_p106.tar.xz 129352 BLAKE2B f66467bbb3dc20e0220b3bd6bba793232900c4a4022085f42597b9108696edbb68d29f59896dceb0d42ff123815f978b32c23eed9fcecfccf2ef87b4642fe5ea SHA512 8b2bafbf78be7c42831e264d7acdca12712c88369cecdb3aa4621c84bb6b450c372f5153f7c3939a5f70d5810c62b98993697397319d286a1bb51b1e4a6ecde6
 DIST lz4-1.7.5.tar.gz 208019 BLAKE2B a3d79d622eb0be2447cc6b0459bd81ae22b44ebe536ebd34b1c394bf1ff560c9b53e3f9203d5c94d046101a48d9b1ea7db74c39875d0a67b3a5f71d9633aa3b7 SHA512 b4e5b17fe06805e676608e636a45f0b480b79a02c6b7ffce84dc4d607861cb2652b2852493ab9d9249e7caeae6f00b6834801fdc39f58d901cbc1c7347915295
 DIST lz4-1.8.0.tar.gz 222840 BLAKE2B 0b33f920f59a5ec9576051baa9ba887b320d424f8f64e1a752124371797d3f8bf2dbf13ee2e7268ef363d70697b8358e7ad627489c6843c61bdba004df80c5ec SHA512 aea46d4a900a3ede7dd7b498ee938ecd98397d3277c5b3a85b4236a44777cba85cd68a2f32c993b872afda96c5dafe0cb3dd391101fe8181e17c9f48884c1535
-DIST lz4-r120.tar.gz 161950 BLAKE2B 59bbcfa30ac0c74ad0388a78ffbdd6c33a69754654365ce525e7f3b2c24a3e8770a9489cdc295d7d5deb70fcb427ecb270af2787b192bb1152cbb19dc14e0d64 SHA512 8b27c57737ba4c2c8e4f00f7ce13f6edc91f74885bad66dd521dfe85d427e0fd78a300896d599bb8642a34fba78446daf207d1b2fd8e91543d4c093e53694e86
 DIST lz4-r131.tar.gz 133784 BLAKE2B f072d1f97ac6f804140c3896dfa95c16eb3c2c2208cfeb35a07535bb345fa100e4169ea91b2aa05655fb61f6f2d64a7c25444778b99841d3e3d0f09b10f570d8 SHA512 60bd95d529691ffee2c43f0d8a62484c3cff74c0154094f073192606806ac8182dced61e0534ffa7e0ccf5f18e9a8cfd2738883a83814c0711a6d7f1d1b252e5
diff --git a/app-arch/lz4/files/lz4-0_p106-cflags.patch b/app-arch/lz4/files/lz4-0_p106-cflags.patch
deleted file mode 100644 (file)
index 6fc0fbb..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/cmake/pack/CMakeLists.txt
-+++ b/cmake/pack/CMakeLists.txt
-@@ -36,7 +36,7 @@
- ADD_DEFINITIONS("-Wundef")\r
- ADD_DEFINITIONS("-Wcast-align")\r
- ADD_DEFINITIONS("-Wno-implicit-function-declaration")\r
--ADD_DEFINITIONS("-O3 -march=native -std=c99")\r
-+ADD_DEFINITIONS("-std=c99")\r
- INCLUDE_DIRECTORIES (${SRC_DIR})\r
- \r
- \r
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -99,7 +99,7 @@
- ADD_DEFINITIONS("-Wundef")\r
- ADD_DEFINITIONS("-Wcast-align")\r
- ADD_DEFINITIONS("-Wno-implicit-function-declaration")\r
--ADD_DEFINITIONS("-Os -march=native -std=c99")\r
-+ADD_DEFINITIONS("-std=c99")\r
- INCLUDE_DIRECTORIES (${SRC_DIR})\r
- \r
- \r
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
deleted file mode 100644 (file)
index 521b1bf..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-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")\r
-     message(STATUS "Build 64bit executable binary")\r
-     add_executable(lz4c64 ${LZ4_SRCS})\r
--    install(TARGETS lz4c64 RUNTIME DESTINATION "./")\r
-+    install(TARGETS lz4c64 RUNTIME DESTINATION "bin/")\r
-     if(NOT BUILD_SHARED_LIBS)\r
-         message(STATUS "Build 32bit executable binary")\r
-         add_executable(lz4c32 ${LZ4_SRCS})\r
--        install(TARGETS lz4c32 RUNTIME DESTINATION "./")\r
-+        install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")\r
- \r
-         SET_TARGET_PROPERTIES(lz4c32 PROPERTIES\r
-             COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")\r
-@@ -53,7 +53,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
- else()\r
-     message(STATUS "Build 32bit executable binary")\r
-     add_executable(lz4c32 ${LZ4_SRCS})\r
--    install(TARGETS lz4c32 RUNTIME DESTINATION "./")\r
-+    install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")\r
- endif()\r
- \r
- if(BUILD_SHARED_LIBS)\r
-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\r
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")\r
-       add_executable(lz4c32 ${LZ4_SRCS})\r
--      install(TARGETS lz4c32 RUNTIME DESTINATION "./")\r
-+      install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")\r
- SET_TARGET_PROPERTIES(lz4c32 PROPERTIES\r
-       COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32 -Os" LINK_FLAGS "-m32")\r
- endif()\r
- \r
- add_executable(lz4c ${LZ4_SRCS})\r
--install(TARGETS lz4c RUNTIME DESTINATION "./")\r
-+install(TARGETS lz4c RUNTIME DESTINATION "bin/")\r
- \r
- add_executable(fuzzer ${FUZZER_SRCS})\r
--install(TARGETS fuzzer RUNTIME DESTINATION "./")\r
-+install(TARGETS fuzzer RUNTIME DESTINATION "bin/")\r
- \r
- #target_link_libraries(lz4 ${LZ4_SRCS_LIB})\r
- ####################### CPACK PACKAGING ###################\r
diff --git a/app-arch/lz4/files/lz4-0_p131-static-libs.patch b/app-arch/lz4/files/lz4-0_p131-static-libs.patch
deleted file mode 100644 (file)
index f8c5c2d..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-fix from upstream
-
-From 43b631223b2d0425a0970876974074934f89c450 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 22 Sep 2016 23:59:02 -0400
-Subject: [PATCH] add a flag to disable static libs
-
----
- lib/Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index b5352a0cb372..27b35c41b693 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -40,6 +40,8 @@
- LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
- LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
- 
-+BUILD_STATIC:= yes
-+
- DESTDIR?=
- PREFIX ?= /usr/local
- CFLAGS ?= -O3
-@@ -71,9 +72,11 @@
- all: liblz4
- 
- liblz4: lz4.c lz4hc.c lz4frame.c xxhash.c
-+ifeq ($(BUILD_STATIC),yes)
-       @echo compiling static library
-       @$(CC) $(CPPFLAGS) $(CFLAGS) -c $^
-       @$(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o
-+endif
-       @echo compiling dynamic library $(LIBVER)
-       @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
-       @echo creating versioned links
-@@ -104,7 +107,9 @@
-       @cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
-       @cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
-       @cp -a liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+ifeq ($(BUILD_STATIC),yes)
-       @install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
-+endif
-       @install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
-       @install -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
-       @install -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
--- 
-2.9.0
-
diff --git a/app-arch/lz4/lz4-0_p106-r1.ebuild b/app-arch/lz4/lz4-0_p106-r1.ebuild
deleted file mode 100644 (file)
index af0720e..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-CMAKE_USE_DIR="${S}/cmake"
-
-if [ ${PV} == "9999" ] ; then
-       inherit subversion
-       ESVN_REPO_URI="https://lz4.googlecode.com/svn/trunk/"
-       ESVN_PROJECT="lz4-read-only"
-else
-       SRC_URI="https://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
-       KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/Cyan4973/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"
-               epatch "${FILESDIR}/${P}-cflags.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-0_p120.ebuild b/app-arch/lz4/lz4-0_p120.ebuild
deleted file mode 100644 (file)
index 85a4e45..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"
-       EGIT_BRANCH=dev
-else
-       MY_PV="r${PV##0_p}"
-       MY_P="${PN}-${MY_PV}"
-       SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-       KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-       S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/Cyan4973/lz4"
-
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-IUSE="test valgrind"
-
-DEPEND="test? ( valgrind? ( dev-util/valgrind ) )"
-
-src_prepare() {
-       if ! use valgrind; then
-               sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die
-       fi
-       multilib_copy_sources
-}
-
-multilib_src_compile() {
-       tc-export CC AR
-       # we must not use the 'all' target since it builds test programs
-       # & extra -m32 executables
-       emake
-       emake -C programs
-}
-
-multilib_src_install() {
-       emake install DESTDIR="${D}" \
-               PREFIX="${EPREFIX}/usr" \
-               LIBDIR="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/app-arch/lz4/lz4-0_p131-r1.ebuild b/app-arch/lz4/lz4-0_p131-r1.ebuild
deleted file mode 100644 (file)
index 47e496d..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"
-       EGIT_BRANCH=dev
-else
-       MY_PV="r${PV##0_p}"
-       MY_P="${PN}-${MY_PV}"
-       SRC_URI="https://github.com/Cyan4973/lz4/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-       S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/Cyan4973/lz4"
-
-LICENSE="BSD-2 GPL-2"
-# Upstream has trouble keeping ABI stable, so please test new versions
-# with abi-compliance-checker and update the subslot every time ABI
-# changes. This is the least we can do to keep things sane.
-SLOT="0/r131"
-IUSE="static-libs test valgrind"
-
-DEPEND="test? ( valgrind? ( dev-util/valgrind ) )"
-
-src_prepare() {
-       if ! use valgrind; then
-               sed -i -e '/^test:/s|test-mem||g' programs/Makefile || die
-       fi
-       epatch "${FILESDIR}"/${PN}-0_p131-static-libs.patch
-       multilib_copy_sources
-}
-
-lmake() {
-       emake \
-               BUILD_STATIC=$(usex static-libs) \
-               PREFIX="${EPREFIX}/usr" \
-               LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
-               "$@"
-}
-
-multilib_src_compile() {
-       tc-export CC AR
-       # we must not use the 'all' target since it builds test programs
-       # & extra -m32 executables
-       lmake -C lib liblz4 liblz4.pc
-       lmake -C programs lz4 lz4c
-       # work around lack of proper target dependencies
-       touch lib/liblz4
-}
-
-multilib_src_test() {
-       lmake -j1 test
-}
-
-multilib_src_install() {
-       lmake install DESTDIR="${D}"
-}