summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina <zerochaos@gentoo.org>2013-06-10 17:23:29 +0000
committerRick Farina <zerochaos@gentoo.org>2013-06-10 17:23:29 +0000
commit7269a484e32650f30c151f730a9c4b3cc9896146 (patch)
tree2ba3cb0e45db2cca61d14b336f3cb10a6242a88b /app-arch/pixz
parentImport the right ebuild this time (diff)
downloadgentoo-2-7269a484e32650f30c151f730a9c4b3cc9896146.tar.gz
gentoo-2-7269a484e32650f30c151f730a9c4b3cc9896146.tar.bz2
gentoo-2-7269a484e32650f30c151f730a9c4b3cc9896146.zip
removing old ebuild, fixing subslot deps
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'app-arch/pixz')
-rw-r--r--app-arch/pixz/ChangeLog6
-rw-r--r--app-arch/pixz/pixz-1.0.2.ebuild6
-rw-r--r--app-arch/pixz/pixz-1.0.ebuild42
-rw-r--r--app-arch/pixz/pixz-9999.ebuild6
4 files changed, 11 insertions, 49 deletions
diff --git a/app-arch/pixz/ChangeLog b/app-arch/pixz/ChangeLog
index 61d06225a4ad..2ec2a4b5eccc 100644
--- a/app-arch/pixz/ChangeLog
+++ b/app-arch/pixz/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/pixz
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/ChangeLog,v 1.6 2013/02/18 01:00:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/ChangeLog,v 1.7 2013/06/10 17:23:29 zerochaos Exp $
+
+ 10 Jun 2013; Rick Farina <zerochaos@gentoo.org> -pixz-1.0.ebuild,
+ pixz-1.0.2.ebuild, pixz-9999.ebuild:
+ removing old ebuild, fixing subslot deps
18 Feb 2013; Mike Frysinger <vapier@gentoo.org> +files/pixz-1.0.2-lm.patch,
pixz-1.0.2.ebuild:
diff --git a/app-arch/pixz/pixz-1.0.2.ebuild b/app-arch/pixz/pixz-1.0.2.ebuild
index a59449e81f92..ac4888f63f73 100644
--- a/app-arch/pixz/pixz-1.0.2.ebuild
+++ b/app-arch/pixz/pixz-1.0.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-1.0.2.ebuild,v 1.3 2013/02/18 01:00:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-1.0.2.ebuild,v 1.4 2013/06/10 17:23:29 zerochaos Exp $
-EAPI=4
+EAPI=5
inherit toolchain-funcs flag-o-matic eutils
@@ -22,7 +22,7 @@ LICENSE="BSD-2"
SLOT="0"
IUSE="static"
-LIB_DEPEND=">=app-arch/libarchive-2.8[static-libs(+)]
+LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
>=app-arch/xz-utils-5[static-libs(+)]"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
diff --git a/app-arch/pixz/pixz-1.0.ebuild b/app-arch/pixz/pixz-1.0.ebuild
deleted file mode 100644
index f22ecab3488a..000000000000
--- a/app-arch/pixz/pixz-1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-1.0.ebuild,v 1.2 2012/12/06 03:09:11 vapier Exp $
-
-EAPI=4
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Parallel Indexed XZ compressor"
-HOMEPAGE="https://github.com/vasi/pixz"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/vasi/pixz.git"
- inherit git-2
- KEYWORDS=""
-else
- SRC_URI="mirror://github/vasi/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="static"
-
-LIB_DEPEND=">=app-arch/libarchive-2.8[static-libs(+)]
- >=app-arch/xz-utils-5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-src_configure() {
- use static && append-ldflags -static
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" OPT=""
-}
-
-src_install() {
- dobin pixz
- dodoc README TODO
-}
diff --git a/app-arch/pixz/pixz-9999.ebuild b/app-arch/pixz/pixz-9999.ebuild
index 0d13dd474bf5..7ece0fd425bb 100644
--- a/app-arch/pixz/pixz-9999.ebuild
+++ b/app-arch/pixz/pixz-9999.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-9999.ebuild,v 1.5 2013/01/11 01:55:11 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pixz/pixz-9999.ebuild,v 1.6 2013/06/10 17:23:29 zerochaos Exp $
-EAPI=4
+EAPI=5
inherit toolchain-funcs flag-o-matic
@@ -12,7 +12,7 @@ LICENSE="BSD-2"
SLOT="0"
IUSE="static"
-LIB_DEPEND=">=app-arch/libarchive-2.8[static-libs(+)]
+LIB_DEPEND=">=app-arch/libarchive-2.8:=[static-libs(+)]
>=app-arch/xz-utils-5[static-libs(+)]"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}