gentoo resync : 30.12.2017

4 files changed, 36 insertions, 14 deletions

diff --git a/app-arch/afio/Manifest b/app-arch/afio/Manifest
index 89e05954f8d6..52036f6a8a60 100644
--- a/app-arch/afio/Manifest
+++ b/app-arch/afio/Manifest
@@ -1,8 +1,9 @@
 AUX Makefile-r1.patch 908 BLAKE2B 998f82d8fbce9d1d993574f27a8f0fb87695140afe2d0e181202ba6a121001e0850ce85696310e2c69223135d58c4361e436fb8597d8900e5d3ad242c24a580a SHA512 09303ec59ebdefa0b5033e55b635c0451f176696c64bdd7e06dbe68efdf3cfb869da4896a09be1e9730da0350ea88fb47302c36b516d45ecf8ca178cc648938a
 AUX Makefile.patch 350 BLAKE2B 67a2e4b01be33fa0151f018b06a80711e4c68084fc5ecadbfb4df8bccbd91b370318cb891e9f799941bc96832fbb69c3db4d724f7697f165c9fd7a823e5847bb SHA512 39431930173e0a2eb6b771623d15aa70bdd0bc90cb01b2d64893ca4fec0d0019d4900b39e4a31c09524d921d9f1f0aa6f0312bb50bd430d6950dfda78455b5cf
+AUX afio-2.5.1-fix-build-system.patch 725 BLAKE2B 3ec8c1068d60db73727fabb02eae50005c1aef8db39df977add2ab312d627fbc16b107b1f007fad9be5b97d1afe02ec0fd38c97c80a804464f1e3985868a3f67 SHA512 ccf6af4e1591d9c8e519dcb9016c49c0a8601f2a03949270b205560bb13e90bdbd50079c4e0abcc3e6290a809ffb24455c00ee5cd70c0168b31b1c01b9bfc093
 DIST afio-2.5.1.tgz 191765 BLAKE2B 48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe SHA512 afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
 DIST afio-2.5.tgz 179184 BLAKE2B 2e4e31b27ce7c7cc60ea81d6d7101289e8cfbe4ff6a52c185abef482e06d233c739e60d40bc2ee35c79405606e5cfe27746813a8e74dbbe1b407d4092707aee5 SHA512 8e8fba115989b60284d09fb37b8f4782b6adc4a0887a05544615a38e62c6b3a48c3194b53ea4496fea64b25d420ff89cf6faab31646998f3612082118fcbb052
-EBUILD afio-2.5.1-r1.ebuild 675 BLAKE2B 89d79cf2da6593f87fdccc6fb0adc4c242a04998a6c230ec912e3bf038b52a0e24de6ad86f986d3125a28dc664ecd4b3d6d2ec1bcbad5941cb31f05a78f7a63a SHA512 c8e90367f959c7505169f3df268933c6756867ec6aadea04444bf17a8b79512e7e5c58408fd3d9326c8f5d1f3013919515b4dfdd81f09a889ff37521371e8c3e
+EBUILD afio-2.5.1-r1.ebuild 691 BLAKE2B 064eb754b4257839ab92953a2daa90611014c1714f3c30df2eeae4c5f7cdb525ffa786834a1235028c696ea1b9917a47922fbd66de78e59cd83e47a261c17155 SHA512 f058255a379de4d9c2ca78c2b0c860ab0cd36c87daab8116d35120e8f080591539e96e218a7983c692858cfc534bb0bf361f8428dc16e4640f2c9976448ea60c
 EBUILD afio-2.5.1.ebuild 666 BLAKE2B ec8dd3cd9796a9a865c3d6ef985ae57e1ed2aefe1d86a4ab1141a0140edfde4863428c20848562c2716fbba84f91ccc8f92f5d3ba7a7c9adc80429ecdb789b3d SHA512 f1e396c6fa251be9a1753af5c0bf979af3bc348d9b6bb1d33c6ba048e73436729df9ff342a67e55ca72689cdb588fa3b8f3db533b5b99b4ed7a61d78ce483cf1
 EBUILD afio-2.5.ebuild 929 BLAKE2B fb37adb79739b5c0b5ce8fc9bb725f41ab7074c9b0ad8f2751bb682ca086d0cf350e6233f5a57835ffc0b9d760695ddb0767c9ef7af76d7b1f3dde82a5764356 SHA512 884f402c47f65285a694885626ec5250117ee2d988496d4b4c631ac3708b3fba00e254bd54ec25855782225640612f1355889fb0ae1b15c2daa0f93627f4e2eb
-MISC metadata.xml 580 BLAKE2B c60974a6f45a50aee82927a71b9f063d3724b1437ff592cca3014e8197415ea8d164047840ac7d722c312d4b0e0972cb9df25e08bde5a6c8d605804e7aa43f66 SHA512 b13cf166120b3dff08a5977e1f72b3e14d689b893b055892c86c9060cba94ef0b640208a00439dc377432d0d2d2115462e75fb0883a7566895770674faacceec
+MISC metadata.xml 591 BLAKE2B 1f4dfca240f8986aba12ac0ee887fc49ccb50248c300d318e09807aa2552f6dc642f0f8a629fd34f1156b9e8407f7a429245893f999afc87db90cb9860329fc7 SHA512 ecde4bb37f668f30eedbb5b07a648fa23183d64593595948e6caf575fa78f8c666a406ed33b4d590190203920e1db7368dfc99b95948a7ab7896d12490f50760
diff --git a/app-arch/afio/afio-2.5.1-r1.ebuild b/app-arch/afio/afio-2.5.1-r1.ebuild
index 0c3a74af973a..d5037ac66c3f 100644
--- a/app-arch/afio/afio-2.5.1-r1.ebuild
+++ b/app-arch/afio/afio-2.5.1-r1.ebuild
@@ -11,12 +11,11 @@ SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc x86"
 
-PATCHES=( "${FILESDIR}"/Makefile-r1.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch )
 
-src_prepare() {
-	default
+src_configure() {
 	tc-export CC
 }
 
@@ -27,7 +26,7 @@ src_install() {
 
 	local i
 	for i in {1..4}; do
-		docinto "script$i"
-		dodoc "script$i"/*
+		docinto "script${i}"
+		dodoc -r "script${i}"/.
 	done
 }
diff --git a/app-arch/afio/files/afio-2.5.1-fix-build-system.patch b/app-arch/afio/files/afio-2.5.1-fix-build-system.patch
new file mode 100644
index 000000000000..5f3e8355c1a2
--- /dev/null
+++ b/app-arch/afio/files/afio-2.5.1-fix-build-system.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -71,15 +71,12 @@
+ MW=
+ #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
+ 
+-CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}
+-
+-CC=gcc
+-
+-CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
+-LDFLAGS =
++CC ?= gcc
++CFLAGS += -Wall -Wstrict-prototypes
++CPPFLAGS += ${LARGEFILEFLAGS} ${2} ${3} ${6} ${8} ${c} ${d} ${e2} ${f} ${g}
+ 
+ afio : afio.o compfile.o exten.o match.o $M
+-	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ clean:
+ 	rm -f *.o afio 
diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml
index b232df5209c8..1d91069b9e13 100644
--- a/app-arch/afio/metadata.xml
+++ b/app-arch/afio/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-Afio makes cpio-format archives. It deals somewhat gracefully
-with input data corruption, supports multi-volume archives during interactive
-operation, and can make compressed archives that are much safer than compressed
-tar or cpio archives. Afio is best used as an 'archive engine' in a backup
-script.
-</longdescription>
+		Afio makes cpio-format archives. It deals somewhat gracefully
+		with input data corruption, supports multi-volume archives during interactive
+		operation, and can make compressed archives that are much safer than compressed
+		tar or cpio archives. Afio is best used as an 'archive engine' in a backup
+		script.
+	</longdescription>
 	<upstream>
 		<remote-id type="freshmeat">afio</remote-id>
 	</upstream>