gentoo resync : 02.06.2018

4 files changed, 205 insertions, 0 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index cd54f3ecbf26..730b40faef6f 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/advancemenu/Manifest b/games-emulation/advancemenu/Manifest
index de3affb2f704..09387f7aa4b8 100644
--- a/games-emulation/advancemenu/Manifest
+++ b/games-emulation/advancemenu/Manifest
@@ -1,5 +1,9 @@
 AUX advancemenu-2.7-alsa-pkg-config.patch 458 BLAKE2B 74b2d6bc6d5aca8cb2ea70b51ecbe3acfdb735f8dea5bc28696079c28a83877296dcbfc57457822a87ac25d25538af0d4d9726d3e026335f6f3cb1e489771b6c SHA512 d1a97d71ea9e5e412db22925a613f59848486586f5635a60fb0acce376b8c6217ef09a6228dfc39b604294b99e3136a849cb9124b55606e32d9e10c48cb9111e
 AUX advancemenu-2.7-pic.patch 272 BLAKE2B 9e486e8d1eb5e1073252e4484ff02dcbe1b2cceab1b4defb678ef6190e3e5604e3d06142dc9da55b16bb82a069f979943fb460d2b352b66fd55cb96ef9b6bfc8 SHA512 600ac7607374ab2e7654303b8205ac737c7b7aae41c23ea1bd005943361df5579207a91658ec4f3ab9f5f802d87d65336efed71894e2e87c0ce19200c769df9b
+AUX advancemenu-2.9-destdir.patch 3419 BLAKE2B 816edf68becb74022e879ea8812d2ba56d2071cdd6167b556c0805566e49c0025051272c951180f609e13f76afc596e3c7af93c00afa240626399c910e714051 SHA512 8fcf78ae0c1eebe672f0f823a98cdd8afef4efa1fccaa10f50131c577629a1f013c397267c6f990537efc5f6491726454e886c5db1c88245cad0a30b6c8c809f
 DIST advancemenu-2.7.tar.gz 2371297 BLAKE2B 43b468f963ecc2ef99766cf9177d7da2edb4c7497f62d9344e80f6c54f2c082ddef294697b7f6438b2959eefc27ca2c05e5744019c55c9f88f59155507622582 SHA512 72aa75b189e4507ce0fe1c5203476833fd04ec9238102631061ed82c2894890044ae40c82154a76533b6ba0a255c42cdfe2ab5c0f497d595783fa13ea32c71bb
+DIST advancemenu-2.9-use_pkgconfig_for_freetype_and_sdl.patch 18514 BLAKE2B b20922280c72ec151c3611ab3247391bd85785ee3db92d4bbd88ed0f0e50a8351a2b0cc63c2bf10aabba8a2bf57bcc5392230af1ed0eaabbfb28f5e34bc4785c SHA512 f68c2b42b48a9e768ecda54b0319148ed5503670f19be5cd4b23f150c6df9a43a053a0e64c8906836f461b49986c650f7e9f3952a5cf1309db66a79ea061123c
+DIST advancemenu-2.9.tar.gz 2515021 BLAKE2B caccbd311b43699766f2928c78983e7c3c45149d8733ea0795212c4f204828a8f4f22d05becd891947d9adce90d009e4d9b01ebfb0b5698ee9411a09d51c26b7 SHA512 ad19970ac9682b03fcfac36ab71cac1ce43aa88b7323ab6ce3a13ae45a29161cd654ce516115e6a441987055b0e9a47d15abae8ca9875753b81f5d7799908386
 EBUILD advancemenu-2.7.ebuild 2294 BLAKE2B a51023d7f931bb1b3ef47bcade4971bc8cfaae9a765c05b674de241a3155248e8faddf2437499818b866896f21a621069ffe5cc1bb78aa05ac98e09e3e47fb51 SHA512 2185634d2eeccb14800fddd08e88c39aab3c09acd1811ce5ebb161eee12e86933645dbdbdbb75af81146dadd1d54068393923602dfeb03c8fa6d0f4461f5dcec
+EBUILD advancemenu-2.9.ebuild 2237 BLAKE2B a8c0fe65acfcdb17e0d2610e8cf62018cc47557a7026f223deef2d125dacacb748859a0e39003d1c1f01c16e9a414f604d4ceb8c1a1dbe889c8ccced0e6d05ac SHA512 b657f77cbd4ca97be357a0ca56a30b84898a193d2440432c81769acc44f822e0969fb6aeaf620e4ee84515ef3c72dea78cd0b9d39215ca53e32304c6bc5e2046
 MISC metadata.xml 334 BLAKE2B 9c8f19757cfe814fe5650009b03d9eb653e3937cf30b4288dfa616a894560bdc81edba8b1ad235f34f5200a2c7ae8e9b19ba0e9f1e0ec5a2560b806ac9e184d8 SHA512 18cabfd831489b32b4449794c06a28425d91dab0c2868038fb48c94728fc16ccca268ae93a4f4a51be01c5901591582e6df2523460ba4ba98719436944577e1f
diff --git a/games-emulation/advancemenu/advancemenu-2.9.ebuild b/games-emulation/advancemenu/advancemenu-2.9.ebuild
new file mode 100644
index 000000000000..532a8cfeca85
--- /dev/null
+++ b/games-emulation/advancemenu/advancemenu-2.9.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator"
+HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"
+SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
+
+# Too big to put into FILESDIR
+SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
+
+RDEPEND="dev-libs/expat
+	alsa? ( media-libs/alsa-lib )
+	ncurses? ( sys-libs/ncurses:0 )
+	sdl? ( media-libs/libsdl )
+	slang? ( >=sys-libs/slang-1.4 )
+	!sdl? ( ( !fbcon? ( media-libs/libsdl ) ) )
+	truetype? ( >=media-libs/freetype-2 )"
+DEPEND="${RDEPEND}
+	x86? ( >=dev-lang/nasm-0.98 )
+	fbcon? ( virtual/os-headers )"
+
+PATCHES=(
+	# pic patch - bug #142021
+	"${FILESDIR}"/${PN}-2.7-pic.patch
+	"${FILESDIR}/${PN}-2.9-destdir.patch"
+	"${DISTDIR}/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's/"-s"//' configure.ac || die
+
+	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
+	eautoreconf
+}
+
+src_configure() {
+	export PATH="${PATH}:${T}"
+	local myeconfargs=(
+		--enable-expat
+		--enable-zlib
+		--disable-svgalib
+		$(use_enable alsa)
+		$(use_enable debug)
+		$(use_enable fbcon fb)
+		$(use_enable ncurses)
+		$(use_enable truetype freetype)
+		$(use_enable oss)
+		$(use_enable sdl)
+		$(use_enable slang)
+		$(use !sdl && use !fbcon && echo --enable-sdl)
+		$(use_enable x86 asm)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	STRIPPROG=true emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc HISTORY README RELEASE doc/*.txt
+	doman doc/{advmenu,advdev}.1
+	docinto html
+	dodoc doc/*.html
+}
+
+pkg_postinst() {
+	echo
+	elog "Execute:"
+	elog "     advmenu -default"
+	elog "to generate a config file"
+	elog
+	elog "An example emulator config found in advmenu.rc:"
+	elog "     emulator \"snes9x\" generic \"${GAMES_BINDIR}/snes9x\" \"%f\""
+	elog "     emulator_roms \"snes9x\" \"/home/user/myroms\""
+	elog "     emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
+	elog
+	elog "For more information, see the advmenu man page."
+}
diff --git a/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch b/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch
new file mode 100644
index 000000000000..9ebef883ae25
--- /dev/null
+++ b/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch
@@ -0,0 +1,112 @@
+--- advancemenu-2.9/advance/advance.mak
++++ advancemenu-2.9/advance/advance.mak
+@@ -284,45 +284,45 @@
+ # Common install
+ 
+ pkgdir = $(datadir)/advance
+-pkgdocdir = $(docdir)/advance
++pkgdocdir = $(docdir)
+ 
+ install-dirs:
+-	-$(INSTALL_PROGRAM_DIR) $(bindir)
+-	-$(INSTALL_DATA_DIR) $(pkgdir)
+-	-$(INSTALL_DATA_DIR) $(pkgdocdir)
+-	-$(INSTALL_MAN_DIR) $(mandir)/man1
++	-$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
++	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)
++	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir)
++	-$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
+ ifneq ($(wildcard $(EMUSRC)),)
+-	-$(INSTALL_DATA_DIR) $(pkgdir)/rom
+-	-$(INSTALL_DATA_DIR) $(pkgdir)/sample
+-	-$(INSTALL_DATA_DIR) $(pkgdir)/artwork
+-	-$(INSTALL_DATA_DIR) $(pkgdir)/image
+-	-$(INSTALL_DATA_DIR) $(pkgdir)/crc
+-	-$(INSTALL_DATA_DIR) $(pkgdir)/snap
++	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom
++	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample
++	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/artwork
++	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image
++	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/crc
++	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap
+ endif
+ 
+ install-data: $(INSTALL_DATAFILES) $(INSTALL_ROMFILES) $(INSTALL_SAMPLEFILES) $(INSTALL_SNAPFILES)
+ ifdef INSTALL_DATAFILES
+ 	@for i in $(INSTALL_DATAFILES); do \
+ 		echo "$(INSTALL_DATA) $$i $(pkgdir)"; \
+-		$(INSTALL_DATA) $$i $(pkgdir); \
++		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir); \
+ 	done
+ endif
+ ifdef INSTALL_ROMFILES
+ 	@for i in $(INSTALL_ROMFILES); do \
+ 		echo "$(INSTALL_DATA) $$i $(pkgdir)/rom"; \
+-		$(INSTALL_DATA) $$i $(pkgdir)/rom; \
++		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom; \
+ 	done
+ endif
+ ifdef INSTALL_SAMPLEFILES
+ 	@for i in $(INSTALL_SAMPLEFILES); do \
+ 		echo "$(INSTALL_DATA) $$i $(pkgdir)/sample"; \
+-		$(INSTALL_DATA) $$i $(pkgdir)/sample; \
++		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample; \
+ 	done
+ endif
+ ifdef INSTALL_SNAPFILES
+ 	@for i in $(INSTALL_SNAPFILES); do \
+ 		echo "$(INSTALL_DATA) $$i $(pkgdir)/snap"; \
+-		$(INSTALL_DATA) $$i $(pkgdir)/snap; \
++		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap; \
+ 	done
+ endif
+ 
+@@ -351,7 +351,7 @@
+ install-bin: $(INSTALL_BINFILES)
+ 	@for i in $(INSTALL_BINFILES); do \
+ 		echo "$(INSTALL_PROGRAM) $$i $(bindir)"; \
+-		$(INSTALL_PROGRAM) $$i $(bindir); \
++		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \
+ 	done
+ 
+ uninstall-bin:
+@@ -363,7 +363,7 @@
+ ifdef INSTALL_DOCFILES
+ 	@for i in $(INSTALL_DOCFILES); do \
+ 		echo "$(INSTALL_DATA) $$i $(pkgdocdir)"; \
+-		$(INSTALL_DATA) $$i $(pkgdocdir); \
++		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \
+ 	done
+ endif
+ 
+@@ -378,7 +378,7 @@
+ ifdef INSTALL_MANFILES
+ 	@for i in $(INSTALL_MANFILES); do \
+ 		echo "$(INSTALL_DATA) $$i $(mandir)/man1"; \
+-		$(INSTALL_DATA) $$i $(mandir)/man1; \
++		$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \
+ 	done
+ endif
+ 
+@@ -401,7 +401,7 @@
+ 	-rmdir $(pkgdocdir)
+ endif
+ 
+-install: install-dirs install-bin install-data install-doc install-man
++install: install-dirs install-bin install-data
+ 
+ uninstall: uninstall-bin uninstall-data uninstall-doc uninstall-man uninstall-dirs
+ 
+--- advancemenu-2.9/configure.ac
++++ advancemenu-2.9/configure.ac
+@@ -1158,8 +1158,8 @@
+ 
+ dnl Final
+ AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag])
+-AC_SUBST([mandir],['${prefix}/man'])
+-AC_SUBST([docdir],['${prefix}/doc'])
++AC_SUBST([mandir],['${prefix}/share/man'])
++AC_SUBST([docdir],['${prefix}/share/doc/${PF}'])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+