diff options
| author |   Richard Yao <ryao@gentoo.org> | 2013-10-13 11:33:59 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2013-10-13 11:33:59 +0000 |
| commit | 77c134a7dd9c97d63107ce8a37ec3b81784fce9b (patch) | |
| tree | 534671d6efae267d0f058f226329410e10084ecf /app-arch | |
| parent | Fix the date for the last entry (diff) | |
| download | gentoo-2-77c134a7dd9c97d63107ce8a37ec3b81784fce9b.tar.gz gentoo-2-77c134a7dd9c97d63107ce8a37ec3b81784fce9b.tar.bz2 gentoo-2-77c134a7dd9c97d63107ce8a37ec3b81784fce9b.zip | |
Remove lz4-0_p106.ebuild pending a fix for incorrectly installed paths
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/lz4/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/lz4/lz4-0_p106.ebuild | 50 | ||||
| -rw-r--r-- | app-arch/lz4/lz4-9999.ebuild | 12 |
3 files changed, 14 insertions, 54 deletions
diff --git a/app-arch/lz4/ChangeLog b/app-arch/lz4/ChangeLog index ec5bf303027c..1a404729a4fa 100644 --- a/app-arch/lz4/ChangeLog +++ b/app-arch/lz4/ChangeLog @@ -1,6 +1,10 @@ # 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.6 2013/10/13 11:16:59 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/ChangeLog,v 1.7 2013/10/13 11:33:59 ryao Exp $ + + 13 Oct 2013; Richard Yao <ryao@gentoo.org> -lz4-0_p106.ebuild, + lz4-9999.ebuild: + Remove lz4-0_p106.ebuild pending a fix for incorrectly installed paths *lz4-0_p106 (13 Oct 2013) diff --git a/app-arch/lz4/lz4-0_p106.ebuild b/app-arch/lz4/lz4-0_p106.ebuild deleted file mode 100644 index c5af6c033c6c..000000000000 --- a/app-arch/lz4/lz4-0_p106.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# 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 cf534c118cac..ed4bd3bbf2fa 100644 --- a/app-arch/lz4/lz4-9999.ebuild +++ b/app-arch/lz4/lz4-9999.ebuild @@ -1,13 +1,12 @@ # 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.6 2013/10/13 11:16:59 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-9999.ebuild,v 1.7 2013/10/13 11:33:59 ryao Exp $ EAPI=5 -inherit cmake-utils +inherit cmake-utils multilib CMAKE_USE_DIR="${S}/cmake" -PREFIX="/usr/bin" if [ ${PV} == "9999" ] ; then inherit subversion @@ -39,8 +38,15 @@ src_configure() { } src_install() { + dodir /usr + dodir "/usr/$(get_libdir)" + ln -s "${ED}/usr/$(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 /usr/bin/{lz4c64,lz4c} |