gentoo resync : 30.12.2017

16 files changed, 155 insertions, 97 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 69cc5630052f..440288a7e06c 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/bin2iso/Manifest b/app-cdr/bin2iso/Manifest
index fe2827bfbb11..524262e88f90 100644
--- a/app-cdr/bin2iso/Manifest
+++ b/app-cdr/bin2iso/Manifest
@@ -1,4 +1,4 @@
-AUX bin2iso-19b-sanity-checks.patch 877 BLAKE2B d43264ba281e3dcc1c09d14342a4ddd0796e7cb6043bc9cf3558b8bf24abaf1ac055e6ab7062a941b678dff5ba9f4f3c7cc245ea2225140966889026a609444c SHA512 33e4ee147a3bb93435d6d45476ceb85dcf4a3c027d12bf0b50937f7c7972cb463544d2fae9de8896f488c32cd05635eb406d4bbabd5ff81189ea4f3317b90c85
+AUX bin2iso-19b-sanity-checks.patch 903 BLAKE2B cdd4efb8e631114aa593dbbec3d4f6f0cc88b8c2dee30d138212269d86b55eaaef70d520c91a13bcb408b507a5020c51f1170d4cc5a237a412b3a113ad1e534e SHA512 cbeaf8e620bc54e531293cee179b94c63cb6e8925ac579d65d0f700013235d9da683af8f367f1687828d23c3aa6f6bd20196e2d4201593048ae0152baf7e26a3
 DIST bin2iso-19b.tar.bz2 9805 BLAKE2B 0800f00d4c67481e1fa4c681450ac4f7c5110aadb1f06e70219ac980590af6e37407c75c9e41d3189726922157af843d951461f19915e66da3a30eb2645d7379 SHA512 1f2dbde824ee32eb3be878bf1b96167d753a3f40eb0baf59f3c72907dcc6ce4c999c04d008efde5269dec306b6eab3dd2b15a18a81388c105545abd04e1769c5
-EBUILD bin2iso-19b-r2.ebuild 727 BLAKE2B eca9cb0a879c3990be2887c07a93060c096f5dd478460efb29afb1f064c49df46b44b0aa652de8de9841791b1237b03bd4b5799dd8e60a0bb43a16956800d844 SHA512 05accbbd87cc78d98804bcca18fd6ba435adca8fc2e89a13c7524f865e825affda3172d4bd61e9e213a077654c31ed3fe21e6d3b945dfffa31478231a79ba3ab
+EBUILD bin2iso-19b-r2.ebuild 655 BLAKE2B 9a8eb4c7cba476324bfe564988d43c869277285d98f5f8c826b61d1aa7183cc443a5acec2bc13d2d2de807c2875368e82b71f454019fcacc8805bfedcdcc1063 SHA512 8f6c51bd162836ec0e7ddc482ef4908ccab8ce4887adf03284ea1c004dc5228c11db0d7c02153ef7aeaf96a38c8fad1a3ab388f2c83966ef2a0fad9a86f4d963
 MISC metadata.xml 294 BLAKE2B 0b315a1e4e53307837d80443e3fffa228f54ffcfc5dfbb1acc8d7a011f4c75b5e49bc638376724f21b242d4cff8030edb0c0c5f9131aad3d7b2b25e76c9fc5ba SHA512 b6fdc3ce5da8e1fdf502c3542820e10a75d054661376f8c75498e5b77f3f2f7ae1f939798661ec4235239ea261a4c9aaa1aa2a03beb6a496bc373ce794e766f5
diff --git a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild b/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
index 1222b25d15a5..7d565d3a1013 100644
--- a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
+++ b/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="converts RAW format (.bin/.cue) files to ISO/WAV format"
 HOMEPAGE="http://users.andara.com/~doiron/bin2iso/"
@@ -12,22 +14,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND=""
-
 S=${WORKDIR}/${PN}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	edos2unix *.c
-	epatch "${FILESDIR}"/${P}-sanity-checks.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-sanity-checks.patch )
 
 src_compile() {
-	$(tc-getCC) bin2iso19b_linux.c -o ${PN} ${CFLAGS} ${LDFLAGS} || die "compile failed"
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} bin2iso19b_linux.c -o ${PN} || die "compile failed"
 }
 
 src_install() {
-	dobin ${PN} || die "dobin failed"
+	dobin ${PN}
 	dodoc readme.txt
 }
diff --git a/app-cdr/bin2iso/files/bin2iso-19b-sanity-checks.patch b/app-cdr/bin2iso/files/bin2iso-19b-sanity-checks.patch
index 5803bc103a86..43e3f4aae3b4 100644
--- a/app-cdr/bin2iso/files/bin2iso-19b-sanity-checks.patch
+++ b/app-cdr/bin2iso/files/bin2iso-19b-sanity-checks.patch
@@ -2,29 +2,29 @@ Add more checks to prevent segfaults in ill-formatted files
 
 http://bugs.gentoo.org/show_bug.cgi?id=90540
 
---- bin2iso19b_linux.c
-+++ bin2iso19b_linux.c
+--- a/bin2iso19b_linux.c
++++ b/bin2iso19b_linux.c
 @@ -237,6 +237,10 @@
-    // Get the 'mode'
-    if (strncmp(&Line[2], "TRACK ", 6)==0) 
-    {
-+      if (Line[8] < '0' || Line[8] > '9' || Line[9] < '0' || Line[9] > '9') {
-+        printf("Error: Track # is not a 2 digit number\n");
-+        exit(1);
-+      }
-       strncpy(track->num, &Line[8], 2); track->num[2] = '\0';
- 
-       track->mode = UNKNOWN;
+    // Get the 'mode'

+    if (strncmp(&Line[2], "TRACK ", 6)==0) 

+    {

++      if (Line[8] < '0' || Line[8] > '9' || Line[9] < '0' || Line[9] > '9') {

++        printf("Error: Track # is not a 2 digit number\n");

++        exit(1);

++      }

+       strncpy(track->num, &Line[8], 2); track->num[2] = '\0';

+ 

+       track->mode = UNKNOWN;

 @@ -246,7 +250,11 @@
-       if(strncmp(&Line[11], "MODE2/2352", 10)==0) track->mode = MODE2_2352;
-       if(strncmp(&Line[11], "MODE2/2336", 10)==0) track->mode = MODE2_2336;
-    }
--   else return(1);
-+   else
-+   {
-+      printf("Error: 2nd line does not begin with '  TRACK '\n");
-+      exit(1);
-+   }
-    
-    // Set the name
-    strcpy(track->name, sBinFilename);
+       if(strncmp(&Line[11], "MODE2/2352", 10)==0) track->mode = MODE2_2352;

+       if(strncmp(&Line[11], "MODE2/2336", 10)==0) track->mode = MODE2_2336;

+    }

+-   else return(1);

++   else

++   {

++      printf("Error: 2nd line does not begin with '  TRACK '\n");

++      exit(1);

++   }

+    

+    // Set the name

+    strcpy(track->name, sBinFilename);

diff --git a/app-cdr/cuegen/Manifest b/app-cdr/cuegen/Manifest
index a2fe2fcde979..c0e0794d1dfc 100644
--- a/app-cdr/cuegen/Manifest
+++ b/app-cdr/cuegen/Manifest
@@ -1,3 +1,4 @@
+AUX cuegen-1.2.0-fix-build-system.patch 260 BLAKE2B 9318ece2533fd138b6666562d564fd6d6fb7fd2891e99207b4f7c65e2e75a43950ce10756c8fc82f02d08ae6090568c13a8abce48a0e6e800d7d21ceb674f2fc SHA512 438b0a306e149e76d4e63bb6206f2296f2ebd6bcaa960ab4f8778188ec4ccb5a2497126d8d6b4076a779a92c2fa3f12b125d2b5ff59332b690250f5c03b5f4ee
 DIST cuegen-1.2.0.tar.gz 4411 BLAKE2B 1f728200823c1121fdb165ee6af1f41cf8ac79e867cc173869843775d36d13ae6798f080b3a7c05d3f36c9fa8e0634edd9f09af5281d19165bb1c24a1ed3e9e1 SHA512 b1da7686944299994b8a04e3253aabc9c6b262f5f2d6d343d0ddd9b06d2c4b1e30441cfc9be6032675148e8d3146709924a486ef004102e02b5f90af7127d58e
-EBUILD cuegen-1.2.0.ebuild 647 BLAKE2B 23c00b6af75e72d3363d2739c8e0c868b6f91aa2ef564411328aa7db2def0c19e31ed76bcccb1f1cffce77c449bf1094c06d180179167c2770296ca7649e7673 SHA512 ffc0c52811f19db366e4ed6ac56f5795f8908c1c60630d1367cbf252e059dd1d600eb8cd1d62e7a43877e0dfaf7e4cc746739e09fba99f302430fe8d79c4fcaf
+EBUILD cuegen-1.2.0.ebuild 608 BLAKE2B 1afc8988e0a854a8599ec1269a1f05ef872d2e3ed11455a752ef40c169ab0eee3f0a14b1c9ba4a33ee7264f07c02b8d9eb9f5df799d693dac76e1e82c97dab65 SHA512 69eb807758b3d57a389ad32bc777b14c031abf4279c47b7ec831b391502e6def2348c26ef6750ffa741ce007547da3455411c4ee9ab86eaee8090e21a748a4b6
 MISC metadata.xml 398 BLAKE2B e342d865f5699fc24ea988a69f3130ef58c4ec335b6565a8c2c80e161782210f6c7bd219a267e788fce15da11792ae06124d6130a494eddf27c25352548f0940 SHA512 28a877de5633dce60c0053f56b647a7c3318bc2111fe82075ff43617016518b3f9997601b9ba1ce021dd2f94136fbe9fbb6c22127b8359f32f5910f8efe80b25
diff --git a/app-cdr/cuegen/cuegen-1.2.0.ebuild b/app-cdr/cuegen/cuegen-1.2.0.ebuild
index 7fbb0a2d7049..2f72c4191258 100644
--- a/app-cdr/cuegen/cuegen-1.2.0.ebuild
+++ b/app-cdr/cuegen/cuegen-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="CUEgen is a FLAC-compatible cuesheet generator for Linux"
 HOMEPAGE="http://www.cs.man.ac.uk/~slavinp/cuegen.html"
@@ -14,18 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+PATCHES=( "${FILESDIR}"/${PN}-1.2.0-fix-build-system.patch )
 
-src_prepare() {
-	sed -i -e 's:\(\${CFLAGS}\):\1 \${LDFLAGS}:g' Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+src_configure() {
+	append-cflags -W -Wall -Wstrict-prototypes -Wmissing-prototypes
+	tc-export CC
 }
 
 src_install() {
-	dobin cuegen || die "install failed"
-	dodoc README
+	dobin cuegen
+	einstalldocs
 }
diff --git a/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch b/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch
new file mode 100644
index 000000000000..614ec59f905d
--- /dev/null
+++ b/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1 @@
+-TARGET := cuegen
+-CC     := gcc
+-CFLAGS := -O2 -pipe -fomit-frame-pointer
+-WARN   := -W -Wall -Wstrict-prototypes -Wmissing-prototypes
+-
+ all:	cuegen
+-
+-cuegen:	cuegen.o
+-	${CC} ${WARN} ${CFLAGS} cuegen.c -o cuegen
diff --git a/app-cdr/daa2iso/Manifest b/app-cdr/daa2iso/Manifest
index 5b179b62a313..0464acf6676a 100644
--- a/app-cdr/daa2iso/Manifest
+++ b/app-cdr/daa2iso/Manifest
@@ -1,4 +1,4 @@
-AUX daa2iso-0.1.7e-buildsystem.patch 593 BLAKE2B ad145e175128dbbdd1a0ce30ea1e723ec08fc3052ba87faaa137a3d8e7658a53471cd5c82be92569e12850919a402efe65e2f73284c72dd03e80aeade4ad0e95 SHA512 e83b866efb303a8af0b2a391a4e38b078836a1bc9e48741ba88901c1ad46f4791cd4fde1889acc4b149c8e895385ff09def7aea3e1144d668d091d9ed1c0bd90
+AUX daa2iso-0.1.7e-buildsystem.patch 342 BLAKE2B 45c7b8c8820f85524b47763fdc5d0eab4c91b89927a68d6d5c1f951c255e3140d596c129ac0dd55efcca498d72c21011326fc2c0887cb5e25a9808d2433390c7 SHA512 44ef91a071fa7723699e185a2c63ca7bcf893df08a94ba0daa6c1803b993558c1d33898818cf73b709d635dc922e32a963491c23985a2f650ea78eaa8687ef75
 DIST daa2iso-0.1.7e.zip 49862 BLAKE2B 701e8e853589e5d0fa1b2b5f80fefde0e61b32dcd40b2b326423e457510b2464fa64f1797e56d46341c13cfd938191a470e04252fd9bf0f39b76a29048a8e378 SHA512 dce00d3bfa4f4e60fd1cfa3ea606bdc8b9fdfc9ce14192ec0204a6da749dc2fb3a0f1de600c19f251e165c7b1f6b66fc14edcd97a38cfa4e163746cc8db5b38c
-EBUILD daa2iso-0.1.7e.ebuild 619 BLAKE2B 2e2b6853bb00129a6a27e72907a4605c99135ea2b5934681716fd373ea9271faafb501a13987fdbf8ae48bb8834de633170ad8c014f13c2a93959748264a213d SHA512 1d71462e0f017861c8c3ba5917432b9ba7c2d5d7aba5e495d628f077bc17ddb499f98bf8624c63b9d91eeb6dba1d7405d3511089263d54511561c2382455d9e9
+EBUILD daa2iso-0.1.7e.ebuild 568 BLAKE2B c957e130a7fa6a1dbb2bb4eba21e60a5145f7e4858716fba4c692eacdd96227d2e8ca1df7fd605d1e8aeb48bfb156b617c59a2ff1705d30b07b1fc492b732c28 SHA512 1688513072d3064df22f6d571931437dca043c17e9a1915a56317f9b74f54957889ddd898f45a9055b5154e3edd4e9e6503becf4e01e13a79c41c9103013b829
 MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild b/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
index e924db28243b..1f49851b0089 100644
--- a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
+++ b/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-inherit base toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="Program for converting the DAA and GBI files to ISO"
 HOMEPAGE="http://aluigi.org/mytoolz.htm"
@@ -16,13 +17,14 @@ IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND=""
 
-S="${WORKDIR}/src"
+S=${WORKDIR}/src
 PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	emake PREFIX="${D}"/usr install || die "emake install failed"
+	emake PREFIX="${ED%/}"/usr install
+	einstalldocs
 }
diff --git a/app-cdr/daa2iso/files/daa2iso-0.1.7e-buildsystem.patch b/app-cdr/daa2iso/files/daa2iso-0.1.7e-buildsystem.patch
index b084d7bb7236..5163d8bfa5d4 100644
--- a/app-cdr/daa2iso/files/daa2iso-0.1.7e-buildsystem.patch
+++ b/app-cdr/daa2iso/files/daa2iso-0.1.7e-buildsystem.patch
@@ -1,22 +1,17 @@
-Index: work/src/Makefile
-===================================================================
---- work.orig/src/Makefile
-+++ work/src/Makefile
-@@ -1,13 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,9 @@
  EXE		= daa2iso
 -CFLAGS	+= -O2 -s
--PREFIX	= /usr/local
-+PREFIX	= /usr/
+ PREFIX	= /usr/local
  BINDIR	= $(PREFIX)/bin
  SRC		= $(EXE).c
  
- all:
+-all:
 -	$(CC) $(CFLAGS) -c LzmaDec.c
 -	$(CC) $(CFLAGS) -c tinflate.c
 -	$(CC) $(SRC) $(CFLAGS) -o $(EXE) LzmaDec.o tinflate.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c LzmaDec.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -c tinflate.c
-+	$(CC) $(SRC) $(CFLAGS) $(LDFLAGS) -o $(EXE) LzmaDec.o tinflate.o
++$(EXE): LzmaDec.o tinflate.o
  
  install:
  	install -m 755 -d $(BINDIR)
diff --git a/app-cdr/dvdshrink/Manifest b/app-cdr/dvdshrink/Manifest
index 07ae207abf64..9e0bf01a1b2c 100644
--- a/app-cdr/dvdshrink/Manifest
+++ b/app-cdr/dvdshrink/Manifest
@@ -1,3 +1,4 @@
+AUX dvdshrink-2.6.1_p10-fix-paths.patch 793 BLAKE2B 7bca779d2e17ed4388dfdf8e6798bf11111a3a25c3bac722f0a5e428b703ccaaad0cd83f8e906d5ed17d123745d073f12d83c130f03fbf38d8a13f981b85cf5f SHA512 8302a9e62b57346a107857c3c3b7095c5838771919b16d4f248c03582100fbb9ab3d55aafbe8b3a911dc1fa89c746a438a9da60ca77af7419068c5bafb9816a3
 DIST dvdshrink-2.6.1-10mdk.tar.gz 1087571 BLAKE2B a45427483b5519ee7abbc787e7afea2f9edcb49f8f6a15843184e7c62e51f7ebb18ad1db35ea695004eda9763dfc9b2a5522b7b4c279a2b63a71b96d091ffe37 SHA512 6766f95bd2bb29ef0877d9b22bc45eb2c508ad2d1a7bb99f84b3f858987fc098a696f15f953efe006bf9556a73f6aa0e6247afcdf8e4c5dad826ddba97f02c06
-EBUILD dvdshrink-2.6.1_p10.ebuild 1201 BLAKE2B 15cb40bdc75f04b2ce1ec5eac1b95291de38ecd3d0dac9a83ba453c6c7b191e9562ed14967d440735786da115fb36fdec61f9b49e530daf087cd9a1e782e1f1c SHA512 e41f209bcf0e3adaa282568330005c02bb926e0c15b375b6de958d981fe80b10cad5f7cf3a083eeed9ab7d7855efce2896d3b98d1b136617de3405d73c58d9c7
+EBUILD dvdshrink-2.6.1_p10.ebuild 1057 BLAKE2B f01d636320244c7ee4bf287a376bb8afa4e1d436501fd8ff590e0412fe6ae6e8d8155f94246bcd2c81c9f407eefb90214db7cbc8bd7f62a48e1a85d2eb438f04 SHA512 9b093d7c68411904176f8884c1aeb579a0b56f7c3d8ee8b2c93c032c446ac51f0d175a80c816a53d451918969c939eb2cf7832cfa4edb8aaf846e62097c5c0e6
 MISC metadata.xml 427 BLAKE2B 0d25c5f4c9d81b6c2e3fefb76d87d1df9e975455fe0d55b241b43549cedde20ff538cff1472121c3a21f9e176a233b69890cd60e55e50018819467192aa4bb53 SHA512 c0a8f2ce1679df431c652810e91285db1f1602a281b432c0dfe5e013ff3d25c22ab23852991a0fdb9cbccbebc5d07d61cce10ffb235012cb0b0b064219d5391c
diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
index 0dd1d1b19267..c7e5f5c4269e 100644
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
+
+inherit desktop
 
 DESCRIPTION="Scriptable DVD copy software"
 HOMEPAGE="http://dvdshrink.sourceforge.net"
@@ -24,21 +25,15 @@ RDEPEND=">=media-video/transcode-1.0.2-r2[dvd]
 DEPEND=""
 
 S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -e 's:applications/::g' -i usr/bin/dvdsfunctions \
-		-i usr/bin/xdvdshrink.pl || die "sed failed."
-}
+PATCHES=( "${FILESDIR}"/${PN}-2.6.1_p10-fix-paths.patch )
 
 src_install() {
-	dobin usr/bin/{batchrip.sh,dvds{functions,hrink}} || die "dobin failed."
+	dobin usr/bin/{batchrip.sh,dvds{functions,hrink}}
 
-	if use gtk; then
-		dobin usr/bin/xdvdshrink.pl || die "dobin failed."
-	fi
+	use gtk && dobin usr/bin/xdvdshrink.pl
 
 	insinto /usr/share
-	doins -r usr/share/applications/dvdshrink || die "doins failed."
+	doins -r usr/share/applications/dvdshrink
 
 	dodoc usr/share/doc/dvdshrink/{batchrip.txt,example.xml,README.txt}
 
diff --git a/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch b/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch
new file mode 100644
index 000000000000..8acbb70073e0
--- /dev/null
+++ b/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch
@@ -0,0 +1,22 @@
+--- a/usr/bin/dvdsfunctions
++++ b/usr/bin/dvdsfunctions
+@@ -1933,7 +1933,7 @@
+    if ! ((`ps -C xdvdshrink.pl > /dev/null 2>&1`)); then GUI=1; fi
+    SAVEISO=0            # Save an ISO along with the burn(s)
+ 
+-   APPDIR=/usr/share/applications/dvdshrink
++   APPDIR=/usr/share/dvdshrink
+ }
+ 
+ # Build a minimal but usable XML file for 'dvdauthor'
+--- a/usr/bin/xdvdshrink.pl
++++ b/usr/bin/xdvdshrink.pl
+@@ -22,7 +22,7 @@
+ 
+ my $login       =  getlogin || getpwuid($<); # Userid of current user
+ my $homedir     = "/home/" . $login;         # Home dir of current user
+-my $app_dir     = "/usr/share/applications/dvdshrink";
++my $app_dir     = "/usr/share/dvdshrink";
+ my $false       = 0;    # A 'false'
+ my $true        = 1;    # A 'true'
+ my $srunning    = 0;    # Is the bash script running
diff --git a/app-cdr/gaffitter/Manifest b/app-cdr/gaffitter/Manifest
index 9d0493251652..df7ee06231c9 100644
--- a/app-cdr/gaffitter/Manifest
+++ b/app-cdr/gaffitter/Manifest
@@ -1,4 +1,5 @@
+AUX gaffitter-0.6.0-fix-build-system.patch 713 BLAKE2B f4faa44bd548d8a806a18e4a86a336c64f045e9bb82f1a4fbe657346e45865ab78e3c28b582a2a43e95a0561cbe2bafd626d1130d73044bcb114546b5eca466b SHA512 72724f2c638ad93d5a10991a1f0b674a2977b6b8a97956cfc08db456dad5775ca35e1fe49848a103ab0a335351a40ce792613263adcba2df7985f48b109ef3b2
 DIST gaffitter-0.6.0.tar.bz2 44433 BLAKE2B 8ae8fb68711168619e69b79c8544dcb926e984ed3e311062060c71f691588c581fb90744c3e984847bd3061e6ed18e6ae07896af8812d6896fb27291af9450e0 SHA512 f27313b0274d2b08e6e9cd7ce86d93c3a944d6d4e4ad103cba8137dd4074bcdfcbd470ef6decdd192e6e5086f27968e27e0b76ca738e9b538db14d83816010b6
 DIST scripts-0.1.0.tar.bz2 5859 BLAKE2B fa774440d9f5b1e8c3a1b4cfd2d65d1d943a904d196df2657ff12e079266b211476bd61b2514be9f629522106ef0b1ef2b21fbb8e0431bf4c6a04273fe3d8a83 SHA512 6730df258444fa4fb17a0d0438b8b1394f857638ce95aaa28dae5345d0bf7517a226a0483a6e8ab89a5012aef9b79586a0cd2b576f9a1ceafc6f29e45d797a20
-EBUILD gaffitter-0.6.0-r1.ebuild 1011 BLAKE2B 76254cbfedbfbaa89d4787eeb6a5b0ac7b32f801a816812d5ed4eebbe068823f155a9f5a5afc9e174dbc7a1f0ac1fb75666b6046cc58336ccc3f6d85d3503cab SHA512 1ccafc7e2114a2dd06a1bf192d7fa936f8588bd523342a25b47a72ce6e737150409d950d6ea76ddc9ff4b60b0545301d7034a3b829c7b4db32ca2caea99caac1
+EBUILD gaffitter-0.6.0-r1.ebuild 882 BLAKE2B 251e65386c7ff36d5fe8fe3e100b7ea19f983a44a8f1ffbaeb7f4088e4538aff21124ae8d676b3b785071100ce0a0e9cbe9f88d2531512937d522f18064173b0 SHA512 7457798f7c242fd904e47391d76d44fc6de3c962574487fedb90a031029bde84785e6c9af8f8a60eac27bb586febc761c588783d659f08432a360c76b98d8bf9
 MISC metadata.xml 433 BLAKE2B 12c8e3692c80100cfa835c65e6609b2d104075fb687bc8b5a48f018570c70e476d102bedcbb713223d093b0843360488842ec3ed23ac4ed4054da704b90f51d3 SHA512 d1fcf8060649dbf5ee3fcfd24a4ac29167e0d4ae34529de8cfefb260a28ffbae476ce393a6a5c6cedf0283ce73f79acedbe5567a2cb9402017209a5048900a2e
diff --git a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
new file mode 100644
index 000000000000..df7d99b9c31e
--- /dev/null
+++ b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
@@ -0,0 +1,32 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -6,28 +6,14 @@
+ 			  optimizers/BestFit.cc optimizers/Split.cc \
+ 			  util/CmdLineParser.cc
+ 
+-INCLUDES = -I/usr/local/include -I.
+-CXX = g++
+-CXXFLAGS = -O3 -Wno-long-long $(INCLUDES)
+-LIBPATH = 
+-LIBS = 
+-LDFLAGS = $(LIBPATH) $(LIBS)
+-
+ ###########################################################################
+ 
+ OBJS = $(CPPFILES:.cc=.o)
+ 
+-.SUFFIXES: .o .cc 
+-
+-.cc.o:
+-	@echo $<:
+-	$(CXX) $(CXXFLAGS) -c $*.cc -o $*.o
+-
+ default: gaffitter 
+ 
+ 
+-gaffitter: $(OBJS) gaffitter.cc Params.h
+-	$(CXX) $(CXXFLAGS) $@.cc $(OBJS) -o $@ $(LDFLAGS)
++gaffitter: $(OBJS) Params.h
+ ###########################################################################
+ 
+ objs: $(OBJS)	
diff --git a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild b/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
index 185ce7a34e7a..f3f46c1d5e98 100644
--- a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
+++ b/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 inherit toolchain-funcs
 
@@ -10,29 +10,35 @@ SCRIPTS="scripts-${SV}"
 
 DESCRIPTION="Genetic Algorithm File Fitter"
 HOMEPAGE="http://gaffitter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	scripts? (
-	mirror://sourceforge/${PN}/scripts/${SV}/${SCRIPTS}.tar.bz2 )"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	scripts? ( mirror://sourceforge/${PN}/scripts/${SV}/${SCRIPTS}.tar.bz2 )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="scripts"
 
+PATCHES=( "${FILESDIR}"/${PN}-0.6.0-fix-build-system.patch )
+
 src_prepare() {
-	sed -i  -e "/^INCLUDES\ =.*/d" \
-		-e "s/^CXXFLAGS\ =.*/CXXFLAGS\ =\ ${CXXFLAGS} ${LDFLAGS}/" \
-		-e "s/^CXX\ =.*/CXX\ =\ $(tc-getCXX)/" src/Makefile || die "sed failed"
+	default
+
 	if use scripts; then
 		sed -i -re "s:--data((cd)|(dvd)):--data:" "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-k3b || die
 	fi
 }
 
+src_configure() {
+	tc-export CXX
+}
+
 src_install() {
-	dobin src/gaffitter || die "dobin failed"
+	dobin src/gaffitter
+	einstalldocs
+
 	if use scripts; then
-		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-** || die
-		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/nautilus/nautilus-* || die
+		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-**
+		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/nautilus/nautilus-*
 	fi
-	dodoc AUTHORS README || die "dodoc failed"
 }