gentoo resync : 14.07.2018

5 files changed, 56 insertions, 20 deletions

diff --git a/media-libs/sge/Manifest b/media-libs/sge/Manifest
index 9078e3100dc2..c3bcbbb03aaa 100644
--- a/media-libs/sge/Manifest
+++ b/media-libs/sge/Manifest
@@ -1,6 +1,7 @@
-AUX sge-030809-build.patch 4020 BLAKE2B f503cd2e76f1cd6845a25816754c254c2873671452495eaa5709926677e12a3634cba33d23bdb38bebfda67169952df0f605484a6900fa70fe8205500d7731d2 SHA512 e6824fcd18226f416289ad96b2774f5f3339fe9feda1a77d797f5d0e229c4bb65b06ed3e92b00db4e12c8343b5c1bb1d7a208b3acfae7ca8001fac7666d9d029
+AUX sge-030809-build.patch 3874 BLAKE2B a01040b011494cdada26c22c163b7f478a59f762bb736370e0ca695ac02248e97ec640b30fb67592a51fd1229d5c8360525a74e9cb3fd8eeac2fcdc466b4cb58 SHA512 d685efed24604339013099deca3846bf1b5547a7518eeecdc36d36cee41a914f9f8d10d0880fbfe7f936ff3538396eff22bded91be553315bf57c6c126cca6a8
 AUX sge-030809-cmap.patch 684 BLAKE2B 951a434b5aa8fbf890b62c9cfaa420137ae5898a91775af03e6d37e324b879176c838487b9537fa1aed9582258285ee80921a834a7b911df80b9ee06049cf435 SHA512 adf9018c09c8e2581d1693cee28224b65c605f95a8df333ab9f50fe14668b501d1e3ce39b91b43216f67f1d107c167b77be8aa28a9025b95ec8ea025e9d6a43e
-AUX sge-030809-freetype.patch 621 BLAKE2B 478e6105ccab4e2200d925cf015968181bd7b35bb6a2cb028f3739b90a77be5ea8a1b07a57163decd16102023b55345ad36517ef27c956bb62226f8a764c7816 SHA512 6a0d22209d047f607b4409519798947a06e0baa15ca628134fe1b503c90fa691274a5fa8a23f30a696f97cc74adb3ea0a2f75daa38e97454c579f223119c7e04
+AUX sge-030809-freetype.patch 625 BLAKE2B c075614e5c163344661a8628bd9b612ab154e8bee063c52e0c64575a5c5e8905da9f0d3edc553c6e5570f395aebf6ef533962f306604402d0abed891f412a890 SHA512 ec7fbcf0d072b6f1b51de6838113d8f1e030a8b91036f6e6674d63728adf1b81e6f31edff7e6bc28d270f200b907c6ecdc924730d9195e563f3da807a519764a
+AUX sge-030809-freetype_pkgconfig.patch 708 BLAKE2B afbbf5b8e6bc7c3404d822464b3b99056bb12c639f61b52285f41acc460d6f6f8826b1511f6147b7a2ece90f28512c9fce8e8695f9d84ae68b4f8b00108a0ef0 SHA512 cd17e10e43ebccca33b876203417aae4fd40d8c0cfda616ee29620cefe4c028fcaccb55adb61902755b8704110291105bb4fd7985a70261065d0bc4ded4c9581
 DIST sge030809.tar.gz 251698 BLAKE2B fbb8ac88e6328c160af95e8922eb401f5ae34b296ba5e5bc161d5236b94ed7fc3b1502cdc684092d73276d1120c2f1eb56bc7571ec44b941cdc6ebcbc51f0176 SHA512 59144d573f254cc451a22a2d60ba68c7d9437b5095f63fc7ec36c21c3caf7580c5365267a004e08b9d08cf187a59ddefb76a5829f4a6aa1ff4d45f7d044bb2fb
-EBUILD sge-030809.ebuild 1209 BLAKE2B cb5e1e660e0c79b48af5415efb1a67fc80375837295a2b6a7ecd6e4d9f888ec5bd1c31a0338ab419fb57de22de26c95b0f9dd4d7bc9bd2452a6d008548f12485 SHA512 5625b1f3ffb06898224a8269822f91a48986f95fc39bc291deb8c99fadeea22fcb0ad04f91ca7bbc60122c376535d295dc4b164da0fe326a49cae2f7c1793b27
+EBUILD sge-030809.ebuild 1325 BLAKE2B a05e59e3d3bbbacaebdd20cf084b17980a78fb26f9a3be18b7c4e2701764040288fde9a0f8e237ec39dbcffa473df3affa6844a89f1ffd1ac236fc665cce2177 SHA512 e956073120c740ffb6f8fc6a0ba82ac7e0f67b883de56d68360c3dee903f9473b91a37108b9f5e7690ef112cccb6fa950ea518fc8d16bc30769717441988c493
 MISC metadata.xml 331 BLAKE2B 0d4e5d5cb7ea39a3404a3b0708d61022a77962c30767cfd801f923749bb5ad2211d6d4ed26e9ada97dbb045cf16542e774b2327bd7d0505df33b3a4333733570 SHA512 65e4d002bc5d040804fd5b43a1b33e89cc8404d1048fea0459a55dc9aca010135ac0944d57282ebf09ccc5d7d8125728a963d08c45837aca4fc92565a77a8ae6
diff --git a/media-libs/sge/files/sge-030809-build.patch b/media-libs/sge/files/sge-030809-build.patch
index 5b277a0a6b08..4ded0888a7f3 100644
--- a/media-libs/sge/files/sge-030809-build.patch
+++ b/media-libs/sge/files/sge-030809-build.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2006-03-29 00:08:39.000000000 -0500
-+++ Makefile	2006-03-29 00:09:36.000000000 -0500
+--- a/Makefile
++++ b/Makefile
 @@ -2,7 +2,7 @@
  
  include Makefile.conf
@@ -95,8 +95,8 @@
  	ln -sf libSGE.so.$(API_VER).$(SGE_VER) libSGE.so.$(API_VER);\
  	ln -sf libSGE.so.$(API_VER) libSGE.so
  	@echo "** Headerfiles installed in $(PREFIX_H)"
---- Makefile.conf.orig	2006-03-29 00:08:39.000000000 -0500
-+++ Makefile.conf	2006-03-29 00:08:39.000000000 -0500
+--- a/Makefile.conf
++++ b/Makefile.conf
 @@ -11,6 +11,7 @@
  # Compilers (C and C++)
  CC=gcc
diff --git a/media-libs/sge/files/sge-030809-freetype.patch b/media-libs/sge/files/sge-030809-freetype.patch
index 7b638e4100f9..f07ce98256a5 100644
--- a/media-libs/sge/files/sge-030809-freetype.patch
+++ b/media-libs/sge/files/sge-030809-freetype.patch
@@ -1,5 +1,5 @@
---- sge_tt_text.cpp
-+++ sge_tt_text.cpp
+--- a/sge_tt_text.cpp
++++ b/sge_tt_text.cpp
 @@ -36,10 +36,9 @@
  #include "sge_textpp.h"
  
diff --git a/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch b/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..ceb478f3d828
--- /dev/null
+++ b/media-libs/sge/files/sge-030809-freetype_pkgconfig.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/655798
+
+--- sge030809/Makefile.conf
++++ sge030809/Makefile.conf
+@@ -35,16 +35,16 @@
+ SGE_LIBS =$(shell sdl-config --libs) -lstdc++
+ 
+ 
+-# Is freetype-config available?
+-HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
++# Is freetype available?
++HAVE_FT =$(shell if pkg-config --exists freetype2 ; then echo "y"; else echo "n"; fi;)
+ ifeq ($(HAVE_FT),n)
+   USE_FT = n
+ endif
+ 
+ ifneq ($(USE_FT),n)
+   USE_FT = y
+-  SGE_LIBS +=$(shell freetype-config --libs)
+-  FT_CFLAGS =$(shell freetype-config --cflags)
++  SGE_LIBS +=$(shell pkg-config --libs freetype2)
++  FT_CFLAGS =$(shell pkg-config --cflags freetype2)
+ endif
+ 
+ 
diff --git a/media-libs/sge/sge-030809.ebuild b/media-libs/sge/sge-030809.ebuild
index 6bff1d0d2baf..159379bb02fd 100644
--- a/media-libs/sge/sge-030809.ebuild
+++ b/media-libs/sge/sge-030809.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 multilib toolchain-funcs
+EAPI=6
+inherit multilib toolchain-funcs
 
 MY_P="sge${PV}"
 DESCRIPTION="Graphics extensions library for SDL"
@@ -14,17 +14,24 @@ SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
 IUSE="doc examples image truetype"
 
-DEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl
 	image? ( media-libs/sdl-image )
 	truetype? ( >=media-libs/freetype-2 )"
 
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-freetype.patch
+	"${FILESDIR}"/${P}-cmap.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-freetype.patch \
-		"${FILESDIR}"/${P}-cmap.patch
+	default
 	sed -i "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" Makefile || die
 	sed -i \
 		-e '/^CC=/d' \
@@ -43,10 +50,13 @@ src_compile() {
 }
 
 src_install() {
-	DOCS="README Todo WhatsNew" \
-		default
+	local DOCS=( README Todo WhatsNew )
+	default
 
-	use doc && dohtml docs/*
+	if use doc ; then
+		docinto html
+		dodoc docs/*
+	fi
 
 	if use examples ; then
 		insinto /usr/share/doc/${PF}