gentoo resync : 02.05.2018

4 files changed, 15 insertions, 14 deletions

diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index 2c7d2d727f0c..f2d18e1d665b 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/foobillard/Manifest b/games-sports/foobillard/Manifest
index 20b367ddeb32..fbdc5590e1b6 100644
--- a/games-sports/foobillard/Manifest
+++ b/games-sports/foobillard/Manifest
@@ -1,7 +1,7 @@
 AUX foobillard-3.0a-as-needed.patch 799 BLAKE2B a19ccb8eef750a11a98a9a2744ceda0c2fd4a4ab3260ec9d88ba082d86d16550cd58ac6c3894de69932a32229edbaeb71135a6a5764af90de0be79646dc32af9 SHA512 91f003cbc8c6f3ce61b4eff79a7d70200374f17aa8a0c45a8f5fecdd56a4f7b58170ca28c92bf729625dcf819c413fe854f0550eef516339d5c712b4bf5bbe3c
 AUX foobillard-3.0a-fbsd.patch 930 BLAKE2B a89503f0f5e7a46d0b5672ff12c7102303ba58b64c0607020c936611e294dd63a5e087e05dad86f2cd43b2d5834aef723ed29704b9de0cba007103e07163d63e SHA512 c0fb2ace1c5e89be8642b0ece28eacf1ace516c59c52f6bd4dfc68701528f71f1830facc9889a50444eb4c799bd57dcbcc6345932c35070aee037453f36b0943
 AUX foobillard-3.0a-gl-clamp.patch 841 BLAKE2B a5a8715e41dbd5426253f2ce2b60724ac7700c6617ad821354ce4821ef7af0d2ce6efd75f34aa7960dd4af5ba9ee5108776329a0eb23074952d710ead194ee45 SHA512 3be3c896f9e789d35236b630e7a587d53112abbfc70e0b5cb32bad1f2b5f0692ed804e14ed7d1f84db89cdb8c34eaccc09801fd5a450efee9d741eb59bd3a3e1
-AUX foobillard-3.0a-no_nvidia.patch 770 BLAKE2B a2c306b2472d40f52e3120fd62096bcc9617972395943978ab2c04de7509e806a052891a5ae1bf81e05fb33aa8f31404a1be91e0753d5cd070f7d4c2e561179d SHA512 77530c4080cbf56c34d4bed20b2b95fd0aaac25e6e640f09aec83ef3eafbbac828c3b801159537b0980aeec1edc4f53d94de431eb4c053f76d5c5c4eb3296f69
+AUX foobillard-3.0a-no_nvidia.patch 774 BLAKE2B 26cee332da6fefab8dd44cdd74fc392bac04fab70415bfa0b529f5f6e86abea7273aec6be9ba1bed9720d6069a77b12f36f40808a447d547dcfaf4105960890b SHA512 d24dd67aff4b69f9776613ac06289c75feded056f7aadc40b47a25dbaf6518d0e6a1d2d38e33004cea6c3f57ffb6716631ce3d1ead28a40b4de1791f18adc023
 DIST foobillard-3.0a.tar.gz 1138477 BLAKE2B 8abb068ec9deacff9748e199782699fe3df70a4e787ece2e8247086ed35f6260b6389fb8fb3f17ebf815f167b7c3a672740de889537e025160614a67bc734c87 SHA512 6ff85255384a83cb147a9682beefa021658ba34ad00ed7879bf7887fff248d41aeb34d2dbe39148ee10bffc53091ea5f168b4afeddac9b50d577bad7799d59b2
-EBUILD foobillard-3.0a.ebuild 1217 BLAKE2B d859f69bfd9174bb0903606e0f340a76a36e6c9f1b9820077dc8954ed4174eca0b95aae651f752c7172527b5620b7f178f7b07153b69cb2dd13db696add7b1ff SHA512 8f38a9f5fbfe00f23e63a085a7ef50f5bcdef321ce36c7f6446a94dc27882b781d24e01b4ae6415a8b9588983b0a24041d879d82d2aea9075fb0a353d4a96e44
+EBUILD foobillard-3.0a-r1.ebuild 1207 BLAKE2B d616ecc81cbe74727ae4bcbcdcb5423fa28225fbffbab62e21b138ba0f07041def70f5e5e4d7396679ae359ed716b863db196945d50b5a3fb85ed7a7bf8ff604 SHA512 bf537f13f0ef89b2c0bd9f7bc9f4e6021a54d633a83790bfb040e1b470d938423399b4ffd051c60b6f6a8e6e021521b79641eb359c17c10a6144c96cceb2406c
 MISC metadata.xml 333 BLAKE2B 0734c0d7cb2cc15deca03ad77aa234c2ede6c95baddca35dd5c07adb2fdf0229f526e664a7b22036257ed16fd86669ab65e6fca819a839f16a698dac90a3739b SHA512 0dd5f539d8dbd30c937ca6a8b67ad9c2d2b62627a0629dffb04b95673635f44f54b99773b0f938ba24b3aec19aa858c5458e9abb121230d9fa7e3652318a9689
diff --git a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
index b43707bc403b..8a9a33c43ea4 100644
--- a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
+++ b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
@@ -1,5 +1,5 @@
---- src/ball.c.orig	2004-06-02 07:00:57.000000000 -0400
-+++ src/ball.c	2004-06-02 07:03:52.000000000 -0400
+--- a/src/ball.c.orig	2004-06-02 07:00:57.000000000 -0400
++++ b/src/ball.c	2004-06-02 07:03:52.000000000 -0400
 @@ -1821,6 +1821,7 @@
              } else if( options_cuberef && cuberef_binds!=0 ){
                  glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]);
diff --git a/games-sports/foobillard/foobillard-3.0a.ebuild b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
index e68d118c8027..02844b26cb97 100644
--- a/games-sports/foobillard/foobillard-3.0a.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic autotools toolchain-funcs games
+EAPI=6
+inherit autotools desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="8ball, 9ball, snooker and carambol game"
 HOMEPAGE="http://foobillard.sourceforge.net/"
@@ -17,14 +17,16 @@ DEPEND="x11-libs/libXaw
 	x11-libs/libXi
 	virtual/opengl
 	virtual/glu
-	>=media-libs/freetype-2.0.9
-	media-libs/libpng:0
+	>=media-libs/freetype-2.0.9:2
+	media-libs/libpng:0=
 	sdl? ( media-libs/libsdl[video] )
-	!sdl? ( media-libs/freeglut )"
-RDEPEND=${DEPEND}
+	!sdl? ( media-libs/freeglut )
+"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-no_nvidia.patch \
 		"${FILESDIR}"/${P}-fbsd.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
@@ -37,7 +39,7 @@ src_prepare() {
 
 src_configure() {
 	use video_cards_nvidia && append-ldflags -L/usr/$(get_libdir)/opengl/nvidia/lib
-	egamesconf \
+	econf \
 		--enable-sound \
 		$(use_enable sdl SDL) \
 		$(use_enable !sdl glut) \
@@ -49,5 +51,4 @@ src_install() {
 	doman foobillard.6
 	newicon data/full_symbol.png foobillard.png
 	make_desktop_entry foobillard Foobillard
-	prepgamesdirs
 }