| 1 |
commit: fd40ac78005fbc99905dbb01968c04780a3e81b4 |
| 2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
| 3 |
AuthorDate: Fri Apr 27 17:26:39 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 27 22:11:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd40ac78 |
| 7 |
|
| 8 |
sys-apps/elfix: git-2->git-r3, git://->https:// |
| 9 |
|
| 10 |
Also eutils is unneeded, autotools is only needed on live ebuilds. |
| 11 |
Go ahead and bump to EAPI=6. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 14 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-apps/elfix/elfix-0.9.2.ebuild | 25 ++++++++++++------------- |
| 17 |
sys-apps/elfix/elfix-9999.ebuild | 25 ++++++++++++------------- |
| 18 |
2 files changed, 24 insertions(+), 26 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-apps/elfix/elfix-0.9.2.ebuild b/sys-apps/elfix/elfix-0.9.2.ebuild |
| 21 |
index 11349cf6d6f..2bc81bd6ca5 100644 |
| 22 |
--- a/sys-apps/elfix/elfix-0.9.2.ebuild |
| 23 |
+++ b/sys-apps/elfix/elfix-0.9.2.ebuild |
| 24 |
@@ -1,13 +1,11 @@ |
| 25 |
-# Copyright 1999-2017 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
-EAPI="5" |
| 30 |
+EAPI=6 |
| 31 |
|
| 32 |
-inherit eutils |
| 33 |
- |
| 34 |
-if [[ ${PV} == "9999" ]] ; then |
| 35 |
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git" |
| 36 |
- inherit git-2 |
| 37 |
+if [[ ${PV} == *9999* ]] ; then |
| 38 |
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git" |
| 39 |
+ inherit autotools git-r3 |
| 40 |
else |
| 41 |
SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz" |
| 42 |
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86" |
| 43 |
@@ -21,6 +19,8 @@ LICENSE="GPL-3" |
| 44 |
SLOT="0" |
| 45 |
IUSE="+ptpax +xtpax" |
| 46 |
|
| 47 |
+DOCS=( AUTHORS ChangeLog INSTALL README THANKS TODO ) |
| 48 |
+ |
| 49 |
REQUIRED_USE="|| ( ptpax xtpax )" |
| 50 |
|
| 51 |
# These only work with a properly configured PaX kernel |
| 52 |
@@ -33,7 +33,11 @@ DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=] |
| 53 |
RDEPEND="${DEPEND}" |
| 54 |
|
| 55 |
src_prepare() { |
| 56 |
- [[ ${PV} == "9999" ]] && ./autogen.sh |
| 57 |
+ default |
| 58 |
+ if [[ ${PV} == *9999* ]]; then |
| 59 |
+ eautoreconf |
| 60 |
+ cd doc && ./make.sh || die |
| 61 |
+ fi |
| 62 |
} |
| 63 |
|
| 64 |
src_configure() { |
| 65 |
@@ -42,8 +46,3 @@ src_configure() { |
| 66 |
$(use_enable ptpax) \ |
| 67 |
$(use_enable xtpax) |
| 68 |
} |
| 69 |
- |
| 70 |
-src_install() { |
| 71 |
- emake DESTDIR="${D}" install |
| 72 |
- dodoc AUTHORS ChangeLog INSTALL README THANKS TODO |
| 73 |
-} |
| 74 |
|
| 75 |
diff --git a/sys-apps/elfix/elfix-9999.ebuild b/sys-apps/elfix/elfix-9999.ebuild |
| 76 |
index 9e35e46644d..0eaa5ebdfec 100644 |
| 77 |
--- a/sys-apps/elfix/elfix-9999.ebuild |
| 78 |
+++ b/sys-apps/elfix/elfix-9999.ebuild |
| 79 |
@@ -1,13 +1,11 @@ |
| 80 |
-# Copyright 1999-2017 Gentoo Foundation |
| 81 |
+# Copyright 1999-2018 Gentoo Foundation |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
|
| 84 |
-EAPI="5" |
| 85 |
+EAPI=6 |
| 86 |
|
| 87 |
-inherit eutils |
| 88 |
- |
| 89 |
-if [[ ${PV} == "9999" ]] ; then |
| 90 |
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git" |
| 91 |
- inherit git-2 |
| 92 |
+if [[ ${PV} == *9999* ]] ; then |
| 93 |
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git" |
| 94 |
+ inherit autotools git-r3 |
| 95 |
else |
| 96 |
SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz" |
| 97 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 98 |
@@ -21,6 +19,8 @@ LICENSE="GPL-3" |
| 99 |
SLOT="0" |
| 100 |
IUSE="+ptpax +xtpax" |
| 101 |
|
| 102 |
+DOCS=( AUTHORS ChangeLog INSTALL README.md THANKS TODO ) |
| 103 |
+ |
| 104 |
REQUIRED_USE="|| ( ptpax xtpax )" |
| 105 |
|
| 106 |
# These only work with a properly configured PaX kernel |
| 107 |
@@ -33,7 +33,11 @@ DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=] |
| 108 |
RDEPEND="${DEPEND}" |
| 109 |
|
| 110 |
src_prepare() { |
| 111 |
- [[ ${PV} == "9999" ]] && ./autogen.sh |
| 112 |
+ default |
| 113 |
+ if [[ ${PV} == *9999* ]]; then |
| 114 |
+ eautoreconf |
| 115 |
+ cd doc && ./make.sh || die |
| 116 |
+ fi |
| 117 |
} |
| 118 |
|
| 119 |
src_configure() { |
| 120 |
@@ -42,8 +46,3 @@ src_configure() { |
| 121 |
$(use_enable ptpax) \ |
| 122 |
$(use_enable xtpax) |
| 123 |
} |
| 124 |
- |
| 125 |
-src_install() { |
| 126 |
- emake DESTDIR="${D}" install |
| 127 |
- dodoc AUTHORS ChangeLog INSTALL README THANKS TODO |
| 128 |
-} |
Archives