gentoo resync : 30.12.2017

16 files changed, 119 insertions, 49 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 409a79ae1048..9e811fab7bef 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/chkrootkit/Manifest b/app-forensics/chkrootkit/Manifest
index 0e1774bf0bf5..99f5ca46bfe7 100644
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@@ -4,5 +4,5 @@ DIST chkrootkit-0.50.tar.gz 38616 BLAKE2B f72d78471f804c2c80d4036452beae04cd4977
 DIST chkrootkit-0.51-gentoo.diff.xz 4708 BLAKE2B 0dacba47222319d9e5bb5d39e0eb4b7074fb3025be885c5fd9564c10f592e04ba4afe2d0c792a2e54fe4c9b1103e366f65af949e7c0db730bf61981fe8fe2364 SHA512 13dca9c272d85d35d736e14896058612f62e1781aac034f06882fe63d956f074a3c67bf308c104f0080323bb127ba01373967b2c28481741d17d83310fe52dd0
 DIST chkrootkit-0.51.tar 174080 BLAKE2B 36acd12801d2ac599b71d0c59165c1489309df0365442aa575bb4c505bbfea5d0daad837fa9b7b40c2aa3841fceda199f37fe5832f0685ad3a0a82ff5e653a3b SHA512 adef6823d069b32305605d0eaa3d3701c6a87900646d9509cebe0fd8a2fec0523595d0dcb4576b32245e7638388d3b43858dbc42be68de9971ac8461fcfdeb34
 EBUILD chkrootkit-0.50.ebuild 1237 BLAKE2B 6f5d11cf720c83d6674be0d18b5ab750b321f4dd01d616dd8dcfeb051603d7bc164f0821cc959d0bfb7444d6d40baaa11a83ae5e7b788f9ce0967e6fd247f672 SHA512 9700c79624724a90d50949f31e19f76c03168b8abf512281f5f8d7f4aaa3984053b764f03280fb5c9cda1adc360c156cd1ffba8799976d57e815bd60c4cf215a
-EBUILD chkrootkit-0.51.ebuild 1334 BLAKE2B 0867c6dc1ee6050632b40a762c992319be5bd6e779e74738ffe1ed05c73a7ce8f1d75f38f6455f961231208b0ee35e73f8dc511b21a6f482e63d6f22591897b9 SHA512 9d588803ce2ead6ab3f49245dafeafd6d96547a8c83b4440018b86f57c5c4ac73b4c370bfa3f3b999da8785625ba3cd5598e34d4754fcb2f8d3e83ecdf930f63
+EBUILD chkrootkit-0.51.ebuild 1333 BLAKE2B 27979bd8e7514cd722d99d92da85146ee3a19a3716b223387c77ea9a26a06095becafb9443f9c5f8fcc13c224c025ecb85d750d91af6beb3c525d406e7159626 SHA512 96cdc86029f13eac4a73445cfeed91c53d9f38f5a4055eef377f4f8972423dc7dd38206b3545e1415d783412590de5f5c0efb55d8c096c7c76ce3c2fb474a3a1
 MISC metadata.xml 254 BLAKE2B 82f42628c121ed27ad00d04687d2f6b52148571b49f1c8f4a81cf47ccf2e857b16c9d0c6a3da2f8bebd6a8803d433a874e8066f48bd18ff960923f53bd15da7b SHA512 f0b5ba232a76e933dd34a7e3e7fa04e627de0201610166f4758c5ccf888f509815b5cc39f5373b87a413496318f507bf28599ec0995d32bde98a7c65287d39bb
diff --git a/app-forensics/chkrootkit/chkrootkit-0.51.ebuild b/app-forensics/chkrootkit/chkrootkit-0.51.ebuild
index 9d94091c198d..3ea59f2a8811 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.51.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.51.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="+cron"
 
 RDEPEND="cron? ( virtual/cron )"
diff --git a/app-forensics/galleta/Manifest b/app-forensics/galleta/Manifest
index f1fc2c3a4bf8..dc286dc76981 100644
--- a/app-forensics/galleta/Manifest
+++ b/app-forensics/galleta/Manifest
@@ -1,3 +1,5 @@
+AUX galleta-20040505_p1-Wimplicit-function-declaration.patch 177 BLAKE2B bcd13ac0d5ef6cf8758ad9da3a48e39ca4881c41d7cb1ead344b5c1e02c83f031f138f0a1e1f47d4073f3d2a3f2b2dda5e599d366df75d5b6b20ae25c9738b36 SHA512 3dc314a1902646b98709f860c1435fed8a2851258749137e1519cb3f522b5ef4f0b1b5859609db8523c0bb9538f454d4d537c7851c61390559a30699c6448c91
+AUX galleta-20040505_p1-fix-build-system.patch 262 BLAKE2B b9c1337dbbb72f68bf040e640855bfdd8b0f090923e1c5326d7040ddfd5e957d9f8007998c890ca3e9ddcdc7d426275ce3e18c16f4e51b84b7c4f4f8fa46e6f2 SHA512 d2f071c61ffa582ebaa554ecd51aae7fd4a73dbf6940d18ecb50024e186958f1e8124f008ec5fa73fbd75c383bc9ea5338c46d1f566d5104e17e0d783eba368d
 DIST galleta_20040505_1.tar.gz 2813 BLAKE2B bbdbd2e004986f51a48c254d3ebfb795e24bf9623dc9254060fb68ddc94e365decf083c38fb8f04818db5c0634fdfde5457d05b44b59c57d9da452c3261d4384 SHA512 7c420a413371cd9d7d818941026bc6981c8a749b8d3c97a9f0fc867116f9e642a06ad2832ded6de08780ed24885c2de7e8b655400569cb7ae56844161308dc3d
-EBUILD galleta-20040505_p1.ebuild 544 BLAKE2B ca6179fbf486f25bc1b28697c3bc9e79685a204e47f4538b6414b4993f4be4a3275da5c03ed114e296c4d0bf8baa2bab09a27db6768b0a45dd7b7ad5678b823e SHA512 087290ad60531da7dc39a221cc969ea75722124dbc15ee8e79ec327ef0c6c024b513ed697e3d1973aadfff6ff5c09bd0653bf4c9e34a829c5dbf3025cd7d73c3
+EBUILD galleta-20040505_p1.ebuild 595 BLAKE2B 42f54d3e79e352944ac039385e7047e69bfa10a33f7cc82ca65f316dcc6a469370b09ee13f7da20fc39c0118bb54a2ea1dcb1e11c3e9f2267b699360d0b0579f SHA512 13fc7d78c92013168527461130becc24ebda17c962e23eed2d0097c96b335a4c50d39b901892614690e227bbda829d8dc12de51ec02d0b43b61ad488a6c98021
 MISC metadata.xml 243 BLAKE2B 49032770463d42b7c19857cc2ea11f0a1a5cbdb1a44b0c77ea2660f377b7d04e113dbb3c7e45870aeb8032d2ef683a35f0f7a958ccadadcbd2de376dd513bed8 SHA512 4e97cd2b4cea4fe6059d375cd29eb5e97c8a40581126a624d1c7a48e2e9092472bc0f4e4f61a95a73121aa183995706b8111757e5dcb3d0bf0458e33029aeda1
diff --git a/app-forensics/galleta/files/galleta-20040505_p1-Wimplicit-function-declaration.patch b/app-forensics/galleta/files/galleta-20040505_p1-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..396739d358fc
--- /dev/null
+++ b/app-forensics/galleta/files/galleta-20040505_p1-Wimplicit-function-declaration.patch
@@ -0,0 +1,11 @@
+--- a/galleta.c
++++ b/galleta.c
+@@ -35,6 +35,8 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <math.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #define STRSIZE		1000
+ 
diff --git a/app-forensics/galleta/files/galleta-20040505_p1-fix-build-system.patch b/app-forensics/galleta/files/galleta-20040505_p1-fix-build-system.patch
new file mode 100644
index 000000000000..125643c894df
--- /dev/null
+++ b/app-forensics/galleta/files/galleta-20040505_p1-fix-build-system.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,6 @@
+-all: install
++LDLIBS += -lm 
+ 
+-install:  galleta.c
+-	gcc -o galleta galleta.c -lm -lc;cp galleta ../bin
++all: galleta
+ 
+ installwin:  galleta.c
+ 	gcc -DCYGWIN -o galleta.exe galleta.c -lm -lc;cp galleta.exe ../bin
diff --git a/app-forensics/galleta/galleta-20040505_p1.ebuild b/app-forensics/galleta/galleta-20040505_p1.ebuild
index 890ad5ab0d30..9192b6bdb8cb 100644
--- a/app-forensics/galleta/galleta-20040505_p1.ebuild
+++ b/app-forensics/galleta/galleta-20040505_p1.ebuild
@@ -1,25 +1,32 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit toolchain-funcs
 
 MY_P=${PN}_${PV/_p/_}
+
 DESCRIPTION="IE Cookie 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}
+S=${WORKDIR}/${MY_P}/src
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
 
-src_compile() {
-	cd src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o galleta galleta.c -lm -lc || die "failed to compile"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dodoc Readme.txt
-	dobin src/galleta
+	dobin ${PN}
+	dodoc ../{CHANGES,Readme.txt}
 }
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
-}
diff --git a/app-forensics/rifiuti/Manifest b/app-forensics/rifiuti/Manifest
index c2b3c5465055..4f3f3b993280 100644
--- a/app-forensics/rifiuti/Manifest
+++ b/app-forensics/rifiuti/Manifest
@@ -1,3 +1,5 @@
+AUX rifiuti-20040505_p1-Wimplicit-function-declaration.patch 232 BLAKE2B f6ac4429c4d2681139ea2fd72c7d06e75b4d11aab0f4fd5453e181b54f624f5156bb493fae7717905e59943d249c6b9a65b486a5c2eaf092b5f20261a0680e32 SHA512 98cef5d4fcc939d7a336077dd52f04006402c581d01337ee968a4594171dfc730dbc93c2cbc8a819fb66da0280b0807d1a46ff89e10d497f1fa0ad341679b091
+AUX rifiuti-20040505_p1-fix-build-system.patch 261 BLAKE2B 8c4c708f8ff9850fa7b6c65fd589b55a0a7368640907b8e32d8dec85082e0725e0c99481d054ce192bcf61c6f8eeb7f2700f1038bd92bba2e8f77fb67d0b8880 SHA512 f7e2fc8e4706c2d2262eeade52fa14478208a69807809954b4e03ada11afab49fa9939f491c11d07895c44829918e9d11c843db7f0385af5e98329596fcaf121
 DIST rifiuti_20040505_1.tar.gz 2823 BLAKE2B 786ad2b6b4f2744b960300cf7cd35e46782a3b6a56a23b6cf1157855d5df8237806cf35243409efdab6e41f6fb004f1954a9291e608152f961a4107a11c37f65 SHA512 9d7e77c3eb74b97fedd66c0cac9c1960d3de0f284fcdee81c1e523eb9898cc9758194d7913b1bd7e0bc82eae4eeed656b7b3c699bcdd536325604d17c41da6de
-EBUILD rifiuti-20040505_p1.ebuild 530 BLAKE2B 9a83761744c79a8532da8662dceccbc311e71d8e04a65cfcefe8fd68a81b44a69ba2ec386b16116a9cf1118a97a8c2f314706fcd4fb2403025f8f24ba74a343a SHA512 3c5ac3c072e1ed5924495539f90983be9d66c007fe42b5c018e6abca0ef94a1a413fa8a294638f86299556b5f3e93f3a73cf292c9a8c6dad75b1cf1d6f4abf7b
+EBUILD rifiuti-20040505_p1.ebuild 599 BLAKE2B 1408d1b8178989f4d31a97eb5d142e383a958b8e40ba86c6a371173b1e3ce10e3a56866f05378c75ddb1ae3af360c4b501748020592ee9a7c35a314b55437667 SHA512 b703849328a01014709161e616c6bae1ab221d2cb80227b5eb55fb1c532cf3dde98e09f068f20606738c2625958b91bbc34a5339c57af6217ee1abcd0948dfd5
 MISC metadata.xml 243 BLAKE2B 49032770463d42b7c19857cc2ea11f0a1a5cbdb1a44b0c77ea2660f377b7d04e113dbb3c7e45870aeb8032d2ef683a35f0f7a958ccadadcbd2de376dd513bed8 SHA512 4e97cd2b4cea4fe6059d375cd29eb5e97c8a40581126a624d1c7a48e2e9092472bc0f4e4f61a95a73121aa183995706b8111757e5dcb3d0bf0458e33029aeda1
diff --git a/app-forensics/rifiuti/files/rifiuti-20040505_p1-Wimplicit-function-declaration.patch b/app-forensics/rifiuti/files/rifiuti-20040505_p1-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..1ac3207a7c4f
--- /dev/null
+++ b/app-forensics/rifiuti/files/rifiuti-20040505_p1-Wimplicit-function-declaration.patch
@@ -0,0 +1,11 @@
+--- a/rifiuti.c
++++ b/rifiuti.c
+@@ -35,6 +35,8 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <math.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #ifdef CYGWIN
+ ssize_t pread( int d, void *buf, size_t nbytes, off_t offset) {
diff --git a/app-forensics/rifiuti/files/rifiuti-20040505_p1-fix-build-system.patch b/app-forensics/rifiuti/files/rifiuti-20040505_p1-fix-build-system.patch
new file mode 100644
index 000000000000..a1c452047913
--- /dev/null
+++ b/app-forensics/rifiuti/files/rifiuti-20040505_p1-fix-build-system.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,6 @@
+-all: install
++LDLIBS += -lm
+ 
+-install:  rifiuti.c
+-	gcc -o rifiuti rifiuti.c -lm -lc;cp rifiuti ../bin
++all: rifiuti
+ 
+ installwin:  rifiuti.c
+ 	gcc -DCYGWIN -o rifiuti.exe rifiuti.c -lm -lc;cp rifiuti.exe ../bin
diff --git a/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild b/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild
index f1e9f1a4f25f..bdb5212fbcc7 100644
--- a/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild
+++ b/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild
@@ -1,24 +1,32 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit toolchain-funcs
 
 MY_P=${PN}_${PV/_p/_}
+
 DESCRIPTION="Recycle Bin Analyzer"
 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}
+S=${WORKDIR}/${MY_P}/src
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
+)
 
-src_compile() {
-	cd src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o rifiuti rifiuti.c -lm -lc || die "failed to compile"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin src/rifiuti
+	dobin ${PN}
+	dodoc ../{CHANGES,Readme.txt}
 }