gentoo resync : 08.05.2018

7 files changed, 47 insertions, 6 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index c845412a62e6..7a393a692948 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/openmortal/Manifest b/games-arcade/openmortal/Manifest
index a79f2f10ec82..4289613553ce 100644
--- a/games-arcade/openmortal/Manifest
+++ b/games-arcade/openmortal/Manifest
@@ -1,5 +1,6 @@
 AUX openmortal-0.7-freetype.patch 394 BLAKE2B b9373aa4e5aa0906a614bf161a6809f13633e4ff7a9ec4694cf0751ba2f6bd2e28f3b3b9099786141fe9cdef4b1c8d7bccdbd3c492b52ad5147c4fed61b2ebec SHA512 52bc47058c41aeb688450c37541f428f7adf8c122c965db0b8c94abc76f5a43f9705d34bdaa17cf5dfe428e23c74532ff03c907b552dea19da3575d21b1d9a74
+AUX openmortal-0.7-freetype_pkgconfig.patch 470 BLAKE2B c09d5876913205eb879bb366a233152139e3cc6c7ace4bcc1d48f4dccfcab7e7be55117205f12426c95462ff3062818c00fa067d96c758e30030761db702ecc1 SHA512 9145794e5c9b3fa30c7bedd85919ccaee852597297e4985a58ab7834ecfc5ba143f377f73bd20c5e3915c4e25ef89d8aa96eb5aace175a8c2379fbf3b6f8cf7c
 AUX openmortal-0.7-gcc41.patch 305 BLAKE2B 1f6cba83ed4af95978045404edfd6396d438ca26f5b9f0d5b159dfb37978a1f50a3a18857db82b3bf74dd74a979563d0f7949e544f4527a57237662502c4c77c SHA512 0bc8c0924a86b4e024602c67bb4136ba67e0dc9d58381a2c00f07ce02845e1d389186c4864720a16cdf828a287ca9d6488e3420512daf7e3585988b0449a930b
 DIST openmortal-0.7.tar.bz2 51197736 BLAKE2B b4744bde2a9695cc5a1323f4e258fe7cf191d7e15e086e37f476feed0ed4039c27a58ee8d0a28b00945a2ba985dc0591bcf1832f070ace6b65ae04826df7ea3b SHA512 8af0b64a3d894dfdbdddafdbdc4c853dc2bfc9b52fd507db2818e67af5ad6cdbbb45f2e42e32103e841759225b1b8c4f33ac5a8ad70e4763698c54803fb81fce
-EBUILD openmortal-0.7-r2.ebuild 789 BLAKE2B 4dc748fbf3d67517a45452114dcdfbce2836cf7abf3c7851db7dca5727b964a80de3fe24000b62e8e31304bb7e5b8b37df3f4b1128a0842b8c27834d86f4fcb4 SHA512 03369f61b7c75dadd3959676a01b7796bbcd5ab6f7249175b4895cb4fe734730049e9ae7287afb3c9559c1032ccecf6fc7b1334dec34bbed68a23dc7b93e7796
+EBUILD openmortal-0.7-r2.ebuild 856 BLAKE2B ca7468ec3757986ba86b3b5c10cc9fc71f4e804a22ca3f5b56aea1e074b48057bc9cc9e2baf37d47211e05d09f1389ca9f726f53cd1897d43ab6eb3385754500 SHA512 31e6dbee577b50d80fd5c0aee48115c2d64bfd9830eb76922ab1e6d8b884f19cee18238430269b31cb7681590ac7eb1332c70172f496a875ff11cb5a3e8df283
 MISC metadata.xml 333 BLAKE2B d6fb63cdba371534a7ae3217ea7d659aba14bdeff1b63bcf9adcca55f0c1975fea3d88beaa695bd95b7c6675c37f049b0c97d2b7666c86acd673e1b1476c6ff3 SHA512 3cf6883bbe8b14f392d0207792ef501bd2c7fa5395a82d1606341b9f44f639879756bc90645cf7bac038ede44865afde59b1622ee0657e1980b6ec3ccd68cefd
diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..fe683899f2e9
--- /dev/null
+++ b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch
@@ -0,0 +1,24 @@
+--- openmortal-0.7/configure.in
++++ openmortal-0.7/configure.in
+@@ -25,6 +25,7 @@
+ AC_C_CONST
+ AC_PROG_CXX
+ 
++PKG_PROG_PKG_CONFIG
+ 
+ dnl
+ dnl Switches
+@@ -122,11 +123,8 @@
+ 
+ dnl Check for Freetype 2 library
+ 
+-FT2_VERSION=2.1.0
+-AC_CHECK_FT2(
+-	$FT2_VERSION,
+-	:,
+-	AC_MSG_ERROR([*** FreeType 2 version $FT2_VERSION not found!])
++PKG_CHECK_MODULES(FT2, freetype2,,
++	AC_MSG_ERROR([*** FreeType2 not found!])
+ )
+ CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
+ LIBS="$LIBS $FT2_LIBS"
diff --git a/games-arcade/openmortal/openmortal-0.7-r2.ebuild b/games-arcade/openmortal/openmortal-0.7-r2.ebuild
index 025e21b639ff..0153c5d051ac 100644
--- a/games-arcade/openmortal/openmortal-0.7-r2.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7-r2.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl[video]
+RDEPEND="media-libs/libsdl[video]
 	media-libs/sdl-image
 	media-libs/sdl-mixer
 	media-libs/sdl-ttf
@@ -21,13 +21,15 @@ DEPEND="media-libs/libsdl[video]
 	>=media-libs/freetype-2.4.0:2
 	dev-lang/perl
 "
-RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	default
 	eapply \
 		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-freetype.patch
+		"${FILESDIR}/${P}"-freetype.patch \
+		"${FILESDIR}/${P}"-freetype_pkgconfig.patch
 	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/games-arcade/tuxpuck/Manifest b/games-arcade/tuxpuck/Manifest
index b29589ff2c76..d570c5f86d67 100644
--- a/games-arcade/tuxpuck/Manifest
+++ b/games-arcade/tuxpuck/Manifest
@@ -1,6 +1,7 @@
+AUX tuxpuck-0.8.2-freetype_pkgconfig.patch 377 BLAKE2B 73f974e8e93cb425e72745fa00a1943a30830dae4bfdee5eef75adc240ebf9885b4dd30f1bfb6291fb873a35a0f63595a11b0399e3b028263065b59a9193542b SHA512 b41eb1a0e64aac8a01ceeab8be43bdaa8da394f6e2fa09222eb78baec0d4b9f622340434111237f37afc8b58ea1d887a012c777afddae75a9394a4519b3925f4
 AUX tuxpuck-0.8.2-ldflags.patch 411 BLAKE2B 0b0a20abe1daf4f02e07f23f8cc0273b5b7cf229ea3b9de3cb13ea4611ba5b6b932ebf9286ebcdb19605de672b66300530a6fb3ca776bdfd1a05a377976d7746 SHA512 50e91cfb89be78e7fbf45c361d9bd2bc2ef84770d868978dbc200bb9954b51789478e611f8e1197e418775624ce57c62424a6a456cd62ffe45ccb93aaa58a88a
 AUX tuxpuck-0.8.2-parallel.patch 1705 BLAKE2B a9402f63386287c1d77f58d6998869c5e946016fda93932f851de73e3edae4b3ec3e08fea68f86c98e5e490d5a168c1bb809332d379470c00db0527fd462e972 SHA512 e489e76fe86f62962017615015f9bca7f15e3b001265d7212ae99a27e833152ab6b1a4caacffc32c4143a47e06ee4d010114d70f57548c7d91ccc8e61667b5e0
 AUX tuxpuck-0.8.2-png15.patch 2128 BLAKE2B b9ebbeff8974dbfd0693dea225e9e73c044aaf5c0d8159458c2c8439fb3d1985c223c71a9e69d47d1c648abcf2784ed7a7d6f9a59a880d2e5b485d3498f0172e SHA512 d6d05b8e10736010a80af565d9dd6cc3aa076070796f348d86c0af8a7d008e1fbb9cffd4422d2193bbe880c0a2637f424879c6e9ce84427f01badbd2129c3b4a
 DIST tuxpuck-0.8.2.tar.gz 384009 BLAKE2B e60241c5e6825ae6570a0d3242178578ef1202d3fbb4276726fdfddb894883fe5e25218bb29f6fd8148d273ab91dd36f0624c814756d8375cea5b88f090fcde7 SHA512 875680f7fd9d4257884c58d8a5529082aac4dc10f1a9c9d08acd4e67ddb5e9c66dd84a4fbcc27e3673e329d845b0966ea683412ffe61f0a403d195eac0f32a46
-EBUILD tuxpuck-0.8.2-r2.ebuild 1119 BLAKE2B 6a3fa12c250fa91ec24ee6468e4b8afc5985db2c582954aa3798f1654a150e569bb8908eadada5376d8d5dc9efc9b42979648eb511835a4e5e4591461a62b6c5 SHA512 461a2977b7d555a5ea7b55b2ddc0d7fa57a6ec75d99d022259edf82d5b820ec96d6e0cef2b3292313b9b4f3125e935f852a7961ca121fdc45b0f1a641e3836bf
+EBUILD tuxpuck-0.8.2-r2.ebuild 1186 BLAKE2B 7d7ec8016949dbbce3137f8745d474b8cdb2e5e4c3b1d0b9366df7a8773a4a18e678e7a78abb590cd24993e5f899e403cc669d17e18891119969ae8306a4f973 SHA512 c07569fc3b6c69b38e9f7b42dcb4fea01b452a07687c6780f66f3744f814d13e6e69a0be0220a3f557dbffb65a553efe0376441c7e99344250a103842fe326de
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..410024e48dcd
--- /dev/null
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
@@ -0,0 +1,11 @@
+--- tuxpuck-0.8.2/utils/Makefile
++++ tuxpuck-0.8.2/utils/Makefile
+@@ -6,7 +6,7 @@
+ all : ttf2font data2c anim
+ 
+ ttf2font : ttf2font.c
+-	$(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
++	$(CC) $(CFLAGS) ttf2font.c `pkg-config --cflags --libs freetype2` -o ttf2font
+ 
+ data2c : data2c.c
+ 	$(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
index b1df215d59d0..092a49327277 100644
--- a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
+++ b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	media-libs/freetype:2
+	virtual/pkgconfig
 "
 
 src_prepare() {
@@ -40,7 +41,8 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-png15.patch \
-		"${FILESDIR}"/${P}-parallel.patch
+		"${FILESDIR}"/${P}-parallel.patch \
+		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
 }
 
 src_compile() {