From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/install-xattr/
Date: Fri, 29 Apr 2016 11:11:41 +0000 (UTC) [thread overview]
Message-ID: <1461928318.651c0e61444d9438f85fd6b9f0095bbb14076e88.blueness@gentoo> (raw)
commit: 651c0e61444d9438f85fd6b9f0095bbb14076e88
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 10:49:41 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 11:11:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=651c0e61
sys-apps/install-xattr: cleanup how we do PREFIX and bump to EAPI=6
Package-Manager: portage-2.2.26
...ttr-9999.ebuild => install-xattr-0.5-r1.ebuild} | 30 ++++++++++++++--------
sys-apps/install-xattr/install-xattr-9999.ebuild | 28 +++++++++++++-------
2 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/sys-apps/install-xattr/install-xattr-9999.ebuild b/sys-apps/install-xattr/install-xattr-0.5-r1.ebuild
similarity index 66%
copy from sys-apps/install-xattr/install-xattr-9999.ebuild
copy to sys-apps/install-xattr/install-xattr-0.5-r1.ebuild
index 7ebd6fa..3e98386 100644
--- a/sys-apps/install-xattr/install-xattr-9999.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.5-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
+
DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes"
HOMEPAGE="https://dev.gentoo.org/~blueness/install-xattr/"
inherit toolchain-funcs
-S="${WORKDIR}/${PN}"
-
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
- EGIT_CHECKOUT_DIR="${S}"
- S+=/misc/${PN}
- inherit git-r3
+ inherit git-2
else
SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ S=${WORKDIR}/${PN}
fi
LICENSE="GPL-3"
@@ -25,11 +23,23 @@ SLOT="0"
src_prepare() {
tc-export CC
- sed -e "s|^\\(PREFIX = \\)\\(/usr\\)$|\\1${EPREFIX}\\2|" \
- -i Makefile || die "sed Makefile failed"
+}
+
+src_compile() {
+ if [[ ${PV} == "9999" ]] ; then
+ cd "${WORKDIR}/${P}/misc/${PN}" || die
+ fi
+ default
+}
+
+src_install() {
+ if [[ ${PV} == "9999" ]] ; then
+ cd "${WORKDIR}/${P}/misc/${PN}" || die
+ fi
+ DESTDIR=${ED} emake install
}
# We need to fix how tests are done
src_test() {
- return 0
+ true
}
diff --git a/sys-apps/install-xattr/install-xattr-9999.ebuild b/sys-apps/install-xattr/install-xattr-9999.ebuild
index 7ebd6fa..d64e0c4 100644
--- a/sys-apps/install-xattr/install-xattr-9999.ebuild
+++ b/sys-apps/install-xattr/install-xattr-9999.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
+
DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes"
HOMEPAGE="https://dev.gentoo.org/~blueness/install-xattr/"
inherit toolchain-funcs
-S="${WORKDIR}/${PN}"
-
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
- EGIT_CHECKOUT_DIR="${S}"
- S+=/misc/${PN}
- inherit git-r3
+ inherit git-2
else
SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ S=${WORKDIR}/${PN}
fi
LICENSE="GPL-3"
@@ -25,11 +23,23 @@ SLOT="0"
src_prepare() {
tc-export CC
- sed -e "s|^\\(PREFIX = \\)\\(/usr\\)$|\\1${EPREFIX}\\2|" \
- -i Makefile || die "sed Makefile failed"
+}
+
+src_compile() {
+ if [[ ${PV} == "9999" ]] ; then
+ cd "${WORKDIR}/${P}/misc/${PN}" || die
+ fi
+ default
+}
+
+src_install() {
+ if [[ ${PV} == "9999" ]] ; then
+ cd "${WORKDIR}/${P}/misc/${PN}" || die
+ fi
+ DESTDIR=${ED} emake install
}
# We need to fix how tests are done
src_test() {
- return 0
+ true
}
next reply other threads:[~2016-04-29 11:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-29 11:11 Anthony G. Basile [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-30 5:47 [gentoo-commits] repo/gentoo:master commit in: sys-apps/install-xattr/ Sam James
2023-12-28 4:38 Sam James
2023-12-01 12:11 Arthur Zamarin
2023-12-01 3:26 Sam James
2023-12-01 3:26 Sam James
2023-12-01 3:26 Sam James
2023-12-01 3:26 Sam James
2023-12-01 3:26 Sam James
2023-11-30 21:40 Sam James
2023-01-11 8:07 Sam James
2021-05-14 22:14 David Seifert
2021-03-31 15:25 Sergei Trofimovich
2021-03-28 11:00 Sam James
2021-03-28 11:00 Sam James
2021-03-28 11:00 Sam James
2021-03-28 10:02 Agostino Sarubbo
2021-03-28 10:00 Agostino Sarubbo
2021-03-28 7:14 Sam James
2019-11-10 1:30 Anthony G. Basile
2019-05-04 19:40 Andreas K. Hüttel
2019-04-14 19:24 Anthony G. Basile
2019-03-30 10:24 Anthony G. Basile
2019-03-30 10:24 Anthony G. Basile
2018-05-18 16:01 Mike Gilbert
2016-04-29 16:32 Anthony G. Basile
2015-12-16 23:04 Anthony G. Basile
2015-12-16 23:03 Anthony G. Basile
2015-10-16 18:26 Mike Frysinger
2015-10-16 18:26 Mike Frysinger
2015-10-09 1:14 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461928318.651c0e61444d9438f85fd6b9f0095bbb14076e88.blueness@gentoo \
--to=blueness@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox