mgorny 14/07/24 21:19:18 Modified: lz4-9999.ebuild ChangeLog Log: Use the development branch. Switch back to plain Makefile which is better supported upstream. Enable tests. Enable multilib support. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.11 app-arch/lz4/lz4-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/lz4-9999.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/lz4-9999.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/lz4-9999.ebuild?r1=1.10&r2=1.11 Index: lz4-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- lz4-9999.ebuild 28 May 2014 12:58:22 -0000 1.10 +++ lz4-9999.ebuild 24 Jul 2014 21:19:18 -0000 1.11 @@ -1,17 +1,15 @@ # 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.10 2014/05/28 12:58:22 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.11 2014/07/24 21:19:18 mgorny Exp $ EAPI=5 -inherit cmake-utils multilib +inherit multilib multilib-minimal -CMAKE_USE_DIR="${S}/cmake_unofficial" - -if [ ${PV} == "9999" ] ; then - inherit subversion - ESVN_REPO_URI="http://lz4.googlecode.com/svn/trunk/"; - ESVN_PROJECT="lz4-read-only" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Cyan4973/lz4.git"; + EGIT_BRANCH=dev else SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.xz"; KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~s390 ~x86 ~amd64-linux ~x86-linux" @@ -20,37 +18,26 @@ DESCRIPTION="Extremely Fast Compression algorithm" HOMEPAGE="https://code.google.com/p/lz4/"; -LICENSE="BSD-2" +LICENSE="BSD-2 GPL-2" SLOT="0" -IUSE="" +IUSE="test" -DEPEND="" -RDEPEND="${DEPEND}" +RDEPEND="" +DEPEND="test? ( dev-util/valgrind )" src_prepare() { - if [[ ${PV} == "9999" ]] - then - subversion_src_prepare - else - epatch "${FILESDIR}/${P}-install-to-bindir.patch" - fi - cmake-utils_src_prepare + multilib_copy_sources } -src_configure() { - local mycmakeargs=(-DBUILD_LIBS=ON -DBUILD_SHARED_LIBS=ON) - cmake-utils_src_configure +multilib_src_compile() { + # we must not use the 'all' target since it builds test programs + # & extra -m32 executables + emake + emake -C programs } -src_install() { - if [[ $(get_libdir) != lib ]]; then - dodir "/usr/$(get_libdir)" - dosym "$(get_libdir)" /usr/lib - fi - - cmake-utils_src_install - - if [[ $(get_libdir) != lib ]]; then - rm "${ED}usr/lib" || die - fi +multilib_src_install() { + emake install DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}"/usr/$(get_libdir) } 1.23 app-arch/lz4/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/ChangeLog?rev=1.23&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/ChangeLog?rev=1.23&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/lz4/ChangeLog?r1=1.22&r2=1.23 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ChangeLog 11 Jul 2014 22:12:12 -0000 1.22 +++ ChangeLog 24 Jul 2014 21:19:18 -0000 1.23 @@ -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.22 2014/07/11 22:12:12 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.23 2014/07/24 21:19:18 mgorny Exp $ + + 24 Jul 2014; Michał Górny <[email protected]> lz4-9999.ebuild: + Use the development branch. Switch back to plain Makefile which is better + supported upstream. Enable tests. Enable multilib support. 11 Jul 2014; <[email protected]> lz4-0_p106-r1.ebuild: Keyworded on arm64, bug #499468
