| 1 |
commit: 651c0e61444d9438f85fd6b9f0095bbb14076e88 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 29 10:49:41 2016 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 29 11:11:58 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=651c0e61 |
| 7 |
|
| 8 |
sys-apps/install-xattr: cleanup how we do PREFIX and bump to EAPI=6 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
...ttr-9999.ebuild => install-xattr-0.5-r1.ebuild} | 30 ++++++++++++++-------- |
| 13 |
sys-apps/install-xattr/install-xattr-9999.ebuild | 28 +++++++++++++------- |
| 14 |
2 files changed, 39 insertions(+), 19 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/install-xattr/install-xattr-9999.ebuild b/sys-apps/install-xattr/install-xattr-0.5-r1.ebuild |
| 17 |
similarity index 66% |
| 18 |
copy from sys-apps/install-xattr/install-xattr-9999.ebuild |
| 19 |
copy to sys-apps/install-xattr/install-xattr-0.5-r1.ebuild |
| 20 |
index 7ebd6fa..3e98386 100644 |
| 21 |
--- a/sys-apps/install-xattr/install-xattr-9999.ebuild |
| 22 |
+++ b/sys-apps/install-xattr/install-xattr-0.5-r1.ebuild |
| 23 |
@@ -1,23 +1,21 @@ |
| 24 |
-# Copyright 1999-2015 Gentoo Foundation |
| 25 |
+# Copyright 1999-2016 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
# $Id$ |
| 28 |
|
| 29 |
-EAPI=5 |
| 30 |
+EAPI=6 |
| 31 |
+ |
| 32 |
DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes" |
| 33 |
HOMEPAGE="https://dev.gentoo.org/~blueness/install-xattr/" |
| 34 |
|
| 35 |
inherit toolchain-funcs |
| 36 |
|
| 37 |
-S="${WORKDIR}/${PN}" |
| 38 |
- |
| 39 |
if [[ ${PV} == "9999" ]] ; then |
| 40 |
EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git" |
| 41 |
- EGIT_CHECKOUT_DIR="${S}" |
| 42 |
- S+=/misc/${PN} |
| 43 |
- inherit git-r3 |
| 44 |
+ inherit git-2 |
| 45 |
else |
| 46 |
SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2" |
| 47 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 48 |
+ S=${WORKDIR}/${PN} |
| 49 |
fi |
| 50 |
|
| 51 |
LICENSE="GPL-3" |
| 52 |
@@ -25,11 +23,23 @@ SLOT="0" |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
tc-export CC |
| 56 |
- sed -e "s|^\\(PREFIX = \\)\\(/usr\\)$|\\1${EPREFIX}\\2|" \ |
| 57 |
- -i Makefile || die "sed Makefile failed" |
| 58 |
+} |
| 59 |
+ |
| 60 |
+src_compile() { |
| 61 |
+ if [[ ${PV} == "9999" ]] ; then |
| 62 |
+ cd "${WORKDIR}/${P}/misc/${PN}" || die |
| 63 |
+ fi |
| 64 |
+ default |
| 65 |
+} |
| 66 |
+ |
| 67 |
+src_install() { |
| 68 |
+ if [[ ${PV} == "9999" ]] ; then |
| 69 |
+ cd "${WORKDIR}/${P}/misc/${PN}" || die |
| 70 |
+ fi |
| 71 |
+ DESTDIR=${ED} emake install |
| 72 |
} |
| 73 |
|
| 74 |
# We need to fix how tests are done |
| 75 |
src_test() { |
| 76 |
- return 0 |
| 77 |
+ true |
| 78 |
} |
| 79 |
|
| 80 |
diff --git a/sys-apps/install-xattr/install-xattr-9999.ebuild b/sys-apps/install-xattr/install-xattr-9999.ebuild |
| 81 |
index 7ebd6fa..d64e0c4 100644 |
| 82 |
--- a/sys-apps/install-xattr/install-xattr-9999.ebuild |
| 83 |
+++ b/sys-apps/install-xattr/install-xattr-9999.ebuild |
| 84 |
@@ -1,23 +1,21 @@ |
| 85 |
-# Copyright 1999-2015 Gentoo Foundation |
| 86 |
+# Copyright 1999-2016 Gentoo Foundation |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
# $Id$ |
| 89 |
|
| 90 |
EAPI=5 |
| 91 |
+ |
| 92 |
DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes" |
| 93 |
HOMEPAGE="https://dev.gentoo.org/~blueness/install-xattr/" |
| 94 |
|
| 95 |
inherit toolchain-funcs |
| 96 |
|
| 97 |
-S="${WORKDIR}/${PN}" |
| 98 |
- |
| 99 |
if [[ ${PV} == "9999" ]] ; then |
| 100 |
EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git" |
| 101 |
- EGIT_CHECKOUT_DIR="${S}" |
| 102 |
- S+=/misc/${PN} |
| 103 |
- inherit git-r3 |
| 104 |
+ inherit git-2 |
| 105 |
else |
| 106 |
SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2" |
| 107 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 108 |
+ S=${WORKDIR}/${PN} |
| 109 |
fi |
| 110 |
|
| 111 |
LICENSE="GPL-3" |
| 112 |
@@ -25,11 +23,23 @@ SLOT="0" |
| 113 |
|
| 114 |
src_prepare() { |
| 115 |
tc-export CC |
| 116 |
- sed -e "s|^\\(PREFIX = \\)\\(/usr\\)$|\\1${EPREFIX}\\2|" \ |
| 117 |
- -i Makefile || die "sed Makefile failed" |
| 118 |
+} |
| 119 |
+ |
| 120 |
+src_compile() { |
| 121 |
+ if [[ ${PV} == "9999" ]] ; then |
| 122 |
+ cd "${WORKDIR}/${P}/misc/${PN}" || die |
| 123 |
+ fi |
| 124 |
+ default |
| 125 |
+} |
| 126 |
+ |
| 127 |
+src_install() { |
| 128 |
+ if [[ ${PV} == "9999" ]] ; then |
| 129 |
+ cd "${WORKDIR}/${P}/misc/${PN}" || die |
| 130 |
+ fi |
| 131 |
+ DESTDIR=${ED} emake install |
| 132 |
} |
| 133 |
|
| 134 |
# We need to fix how tests are done |
| 135 |
src_test() { |
| 136 |
- return 0 |
| 137 |
+ true |
| 138 |
} |
Archives