From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-713421-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 6255913877A
for <garchives@archives.gentoo.org>; Thu, 24 Jul 2014 21:55:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BCD68E0935;
Thu, 24 Jul 2014 21:55:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C395EE0870
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Jul 2014 21:55:17 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9CF71341161
for <gentoo-commits@lists.gentoo.org>; Thu, 24 Jul 2014 21:19:19 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 2279)
id 4F40A2004E; Thu, 24 Jul 2014 21:19:18 +0000 (UTC)
From: "Michal Gorny (mgorny)" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-arch/lz4: lz4-9999.ebuild ChangeLog
X-VCS-Repository: gentoo-x86
X-VCS-Files: lz4-9999.ebuild ChangeLog
X-VCS-Directories: app-arch/lz4
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michal Gorny
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Message-Id: <20140724211918.4F40A2004E@flycatcher.gentoo.org>
Date: Thu, 24 Jul 2014 21:19:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 74f64f71-2467-4e5d-8cbb-648047b8a68b
X-Archives-Hash: 3ca29bb7b5cedd6cee5c57d4288c698e
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 <mgorny@gentoo.org> 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; <tgall@gentoo.org> lz4-0_p106-r1.ebuild:
Keyworded on arm64, bug #499468