gentoo resync : 30.12.2017

5 files changed, 37 insertions, 32 deletions

diff --git a/app-forensics/pasco/Manifest b/app-forensics/pasco/Manifest
index 5b92c41c44a0..bca0838d8a5b 100644
--- a/app-forensics/pasco/Manifest
+++ b/app-forensics/pasco/Manifest
@@ -1,4 +1,5 @@
+AUX pasco-20040505_p1-Wimplicit-function-declaration.patch 192 BLAKE2B a043c010122fd9f160b169c9757dd14e4e775a02521f881333dbd3e2904c16f73064c9a509969919288795a957489e8c9732cf273fe0ad41472483065ea9cc51 SHA512 fdd4ed41a5dfef7a111ec7573a556529ff93cce37932593ce005c3b935ca19f0f677fb9da67ee2b01ab7f3822ca7ff5731117f6201c95a0b3fcb7cf8182b271c
+AUX pasco-20040505_p1-fix-build-system.patch 243 BLAKE2B aa4b5383117fbcfb237f62b8e6e2e6e913becaf1a9722c613895c96e227a6153455dd589e8006b1ae56376f42319d68499a6defdc9ada2bd87e3ead0c5f7cacf SHA512 b83440d8e674d710e5dd3d8e75e197da3eb12e3c83e521223ffd573b9ebe9ea885638afa08aee3593f5b8b32dfd7f9f4628ee0a9e57823a3ee76217d7572ec6f
 DIST pasco_20040505_1.tar.gz 4032 BLAKE2B 2a6520f48fbe8410b73ab01e95d14c1ff7e1f872dd8b4ab0e02a70c5880abd99d1d0418f82ea65fb19bd941bd8104d3a8e96697652cefc18e01c16f873fa3c79 SHA512 fd3c1b31618a64ea9a381c68971800a511f8c826a26ca0f554bd6c69f4992312c0c34adf7067da97ff6d7c11b7ed8a64401435fa9ceb218e165cf83a3b6083db
-EBUILD pasco-20040505_p1-r1.ebuild 526 BLAKE2B 3dcb38a548969a7759ccf0417a5835a19b4959b1944cfe128acde00d8069b4ecd99e0fad1b4588fbbd16b088d955a57c099e9d2ba848962ef9e7083bdfdba39c SHA512 0411ef2a14440671572a9798c764869c40f8908cc3c563de5fc7704c18330fec461567d41a2e86e1f5776d3209b4a00376652294edb9f52d6e4706e130169275
-EBUILD pasco-20040505_p1.ebuild 522 BLAKE2B 569babd775232debacb78c8feca1f1d77f4cf1fac29225e6208bd8f008aecc9e3a06ff6c705d772fd1fb5bddb656366c8260c5cd4f0f12e9d5434ecb9aa805cd SHA512 afdf323921cdfdcf965342ba1fd227a5b6b234161dd91586a99f2fee03ffccffeefd9730c82a88459856b80470f09f3255c47e2b709e7fab9af7bb08ac194b04
+EBUILD pasco-20040505_p1-r1.ebuild 597 BLAKE2B 43fec951b72d08250da3baa45123644bd14dfda01471e901950e610a0049018e70c201dfa396a59be955cef8ddb1b4b84c30b36a9556a731ed02bf593b855267 SHA512 71214aa2f614b99883609ccd10b25131d0fee5abe55b1cb1096fd7f1fe80b585d55983b0b53d3c344887e5e6b42dab6e700872265caea3a384a6ffb27a5b7a19
 MISC metadata.xml 243 BLAKE2B 49032770463d42b7c19857cc2ea11f0a1a5cbdb1a44b0c77ea2660f377b7d04e113dbb3c7e45870aeb8032d2ef683a35f0f7a958ccadadcbd2de376dd513bed8 SHA512 4e97cd2b4cea4fe6059d375cd29eb5e97c8a40581126a624d1c7a48e2e9092472bc0f4e4f61a95a73121aa183995706b8111757e5dcb3d0bf0458e33029aeda1
diff --git a/app-forensics/pasco/files/pasco-20040505_p1-Wimplicit-function-declaration.patch b/app-forensics/pasco/files/pasco-20040505_p1-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..22acc9edd9f0
--- /dev/null
+++ b/app-forensics/pasco/files/pasco-20040505_p1-Wimplicit-function-declaration.patch
@@ -0,0 +1,10 @@
+--- a/pasco.c
++++ b/pasco.c
+@@ -36,6 +36,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <math.h>
++#include <string.h>
+ 
+ //
+ /* This is the default block size for an activity record */
diff --git a/app-forensics/pasco/files/pasco-20040505_p1-fix-build-system.patch b/app-forensics/pasco/files/pasco-20040505_p1-fix-build-system.patch
new file mode 100644
index 000000000000..63a6102c8c13
--- /dev/null
+++ b/app-forensics/pasco/files/pasco-20040505_p1-fix-build-system.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,6 @@
+-all: install
++LDLIBS += -lm
+ 
+-install:  pasco.c
+-	gcc -o pasco pasco.c -lm -lc;cp pasco ../bin
++all: pasco
+ 
+ installwin:  pasco.c
+ 	gcc -DCYGWIN -o pasco.exe pasco.c -lm -lc;cp pasco.exe ../bin
diff --git a/app-forensics/pasco/pasco-20040505_p1-r1.ebuild b/app-forensics/pasco/pasco-20040505_p1-r1.ebuild
index a924a60da63e..848aa78cff30 100644
--- a/app-forensics/pasco/pasco-20040505_p1-r1.ebuild
+++ b/app-forensics/pasco/pasco-20040505_p1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -10,17 +10,23 @@ MY_P=${PN}_${PV/_p/_}
 DESCRIPTION="IE Activity Parser"
 HOMEPAGE="https://sourceforge.net/projects/odessa/"
 SRC_URI="mirror://sourceforge/odessa/${MY_P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-S="${WORKDIR}/${MY_P}/src"
+S=${WORKDIR}/${MY_P}/src
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
 
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c -lm -lc || die "failed to compile"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin ${PN}
+	dodoc ../{CHANGES,Readme.txt}
 }
diff --git a/app-forensics/pasco/pasco-20040505_p1.ebuild b/app-forensics/pasco/pasco-20040505_p1.ebuild
deleted file mode 100644
index 99f64ec6b6fb..000000000000
--- a/app-forensics/pasco/pasco-20040505_p1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-MY_P=${PN}_${PV/_p/_}
-DESCRIPTION="IE Activity Parser"
-HOMEPAGE="https://sourceforge.net/projects/odessa/"
-SRC_URI="mirror://sourceforge/odessa/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	cd src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o pasco pasco.c -lm -lc || die "failed to compile"
-}
-
-src_install() {
-	dobin src/pasco
-}