| 1 |
commit: 4d7bcfa241bab041f0b924c534db5fe9b7e53877 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 30 18:01:47 2017 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 30 18:29:49 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7bcfa2 |
| 7 |
|
| 8 |
dev-util/its4: LDFLAGS, Manifests, license |
| 9 |
|
| 10 |
- LDFLAGS/g++/EAPI/keywords fix from Michael Mair-Keimberger (iamnr3) |
| 11 |
<bu9zilla <AT> gmail.com>, per bug #337724. |
| 12 |
- Update Manifests to include WHIRLPOOL & SHA256 per bug 612732. |
| 13 |
- License Review: fetch & unmodified mirroring is permitted. |
| 14 |
|
| 15 |
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=337724 |
| 16 |
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=612732 |
| 17 |
Package-Manager: portage-2.3.3 |
| 18 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 19 |
|
| 20 |
dev-util/its4/Manifest | 2 +- |
| 21 |
.../{its4-1.1.1.ebuild => its4-1.1.1-r1.ebuild} | 35 ++++++++++++---------- |
| 22 |
dev-util/its4/its4-1.1.1.ebuild | 8 +---- |
| 23 |
3 files changed, 22 insertions(+), 23 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-util/its4/Manifest b/dev-util/its4/Manifest |
| 26 |
index c42070e059d..47c4c8d9913 100644 |
| 27 |
--- a/dev-util/its4/Manifest |
| 28 |
+++ b/dev-util/its4/Manifest |
| 29 |
@@ -1 +1 @@ |
| 30 |
-DIST its4-1.1.1.tgz 59759 RMD160 7f3fef7b7f5c6cf4f7e203481a44957bcf74e606 SHA1 f95711fad1a10ca127514132db04791a01088d77 SHA256 386ca694c969108863f3e5c0571ea8c5cbdc288dd13e12ba573a592844682df4 |
| 31 |
+DIST its4-1.1.1.tgz 59759 SHA256 386ca694c969108863f3e5c0571ea8c5cbdc288dd13e12ba573a592844682df4 SHA512 c7bfa71eba114ab3aac586dfa5f30c7a935f06d72b78bae3c3d464f591085cf3419a1d23ab951376bd9c2d7e436711a45c9f5047c3125df5d731b746412be0f6 WHIRLPOOL b734a79abb2eb2a3df330f06852d35aee61c451419fe915fdc0788dbcc9eb51ef282f8bdc9aac2d712fa2bdc21b23a743da9a55dd66fa0a58229036bb1b2e8c8 |
| 32 |
|
| 33 |
diff --git a/dev-util/its4/its4-1.1.1.ebuild b/dev-util/its4/its4-1.1.1-r1.ebuild |
| 34 |
similarity index 66% |
| 35 |
copy from dev-util/its4/its4-1.1.1.ebuild |
| 36 |
copy to dev-util/its4/its4-1.1.1-r1.ebuild |
| 37 |
index a7e86e1dd3d..e000308a5cb 100644 |
| 38 |
--- a/dev-util/its4/its4-1.1.1.ebuild |
| 39 |
+++ b/dev-util/its4/its4-1.1.1-r1.ebuild |
| 40 |
@@ -1,36 +1,41 @@ |
| 41 |
-# Copyright 1999-2010 Gentoo Foundation |
| 42 |
+# Copyright 1999-2017 Gentoo Foundation |
| 43 |
# Distributed under the terms of the GNU General Public License v2 |
| 44 |
|
| 45 |
+EAPI="5" |
| 46 |
+ |
| 47 |
+inherit eutils |
| 48 |
+ |
| 49 |
DESCRIPTION="ITS4: Software Security Tool" |
| 50 |
HOMEPAGE="http://www.cigital.com/its4/" |
| 51 |
SRC_URI="${P}.tgz" |
| 52 |
LICENSE="ITS4" |
| 53 |
SLOT="0" |
| 54 |
-KEYWORDS="x86 ppc" |
| 55 |
+KEYWORDS="~x86 ~ppc ~amd64" |
| 56 |
IUSE="" |
| 57 |
-DEPEND="sys-devel/gcc" |
| 58 |
-RESTRICT="mirror fetch" |
| 59 |
-#RDEPEND="" |
| 60 |
-S="${WORKDIR}/${PN}" |
| 61 |
|
| 62 |
-pkg_nofetch() { |
| 63 |
- einfo "Please visit ${HOMEPAGE} to download the source, and place it in" |
| 64 |
- einfo "${DISTDIR}" |
| 65 |
-} |
| 66 |
+DEPEND="" |
| 67 |
+RDEPEND="" |
| 68 |
+ |
| 69 |
+S="${WORKDIR}/${PN}" |
| 70 |
|
| 71 |
-src_unpack() { |
| 72 |
- unpack ${A} |
| 73 |
+src_prepare() { |
| 74 |
sed -i \ |
| 75 |
-e 's,iostream.h,iostream,g'\ |
| 76 |
- "${S}"/configure |
| 77 |
+ "${S}"/configure || die |
| 78 |
+ sed -i \ |
| 79 |
+ -e 's/$(CC) -o/$(CC) $(OPTIMIZATION) $(EXTRA_FLAGS) -o/' \ |
| 80 |
+ "${S}"/Makefile.in || die |
| 81 |
} |
| 82 |
|
| 83 |
-src_compile() { |
| 84 |
+src_configure() { |
| 85 |
# WARNING |
| 86 |
# non-standard configure |
| 87 |
# do NOT use econf |
| 88 |
./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/its4 || die "configure failed" |
| 89 |
- emake OPTIMIZATION="${CXXFLAGS}" || die "emake failed" |
| 90 |
+} |
| 91 |
+ |
| 92 |
+src_compile() { |
| 93 |
+ emake CC="$(tc-getCXX)" OPTIMIZATION="${CXXFLAGS}" EXTRA_FLAGS="${LDFLAGS}" |
| 94 |
} |
| 95 |
|
| 96 |
src_install() { |
| 97 |
|
| 98 |
diff --git a/dev-util/its4/its4-1.1.1.ebuild b/dev-util/its4/its4-1.1.1.ebuild |
| 99 |
index a7e86e1dd3d..fab10d76369 100644 |
| 100 |
--- a/dev-util/its4/its4-1.1.1.ebuild |
| 101 |
+++ b/dev-util/its4/its4-1.1.1.ebuild |
| 102 |
@@ -1,4 +1,4 @@ |
| 103 |
-# Copyright 1999-2010 Gentoo Foundation |
| 104 |
+# Copyright 1999-2017 Gentoo Foundation |
| 105 |
# Distributed under the terms of the GNU General Public License v2 |
| 106 |
|
| 107 |
DESCRIPTION="ITS4: Software Security Tool" |
| 108 |
@@ -9,15 +9,9 @@ SLOT="0" |
| 109 |
KEYWORDS="x86 ppc" |
| 110 |
IUSE="" |
| 111 |
DEPEND="sys-devel/gcc" |
| 112 |
-RESTRICT="mirror fetch" |
| 113 |
#RDEPEND="" |
| 114 |
S="${WORKDIR}/${PN}" |
| 115 |
|
| 116 |
-pkg_nofetch() { |
| 117 |
- einfo "Please visit ${HOMEPAGE} to download the source, and place it in" |
| 118 |
- einfo "${DISTDIR}" |
| 119 |
-} |
| 120 |
- |
| 121 |
src_unpack() { |
| 122 |
unpack ${A} |
| 123 |
sed -i \ |
Archives