Merge updates from master

5 files changed, 145 insertions, 0 deletions

diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
new file mode 100644
index 000000000000..17498149a2a9
--- /dev/null
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="Meta ebuild for LXDE, the Lightweight X11 Desktop Environment"
+HOMEPAGE="http://lxde.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=lxde-base/menu-cache-0.3.3
+	>=lxde-base/lxappearance-0.5.5
+	>=lxde-base/lxde-icon-theme-0.5.0
+	>=lxde-base/lxde-common-0.5.5
+	>=lxde-base/lxmenu-data-0.1.4
+	>=lxde-base/lxinput-0.3.2
+	>=lxde-base/lxpanel-0.5.10
+	>=lxde-base/lxrandr-0.1.2
+	>=lxde-base/lxsession-0.5.2
+	|| ( >=x11-libs/libfm-1.2.0 =lxde-base/lxshortcut-0.1* )
+	>=lxde-base/lxtask-0.1.6
+	>=lxde-base/lxterminal-0.1.11
+	media-gfx/gpicview
+	x11-misc/pcmanfm
+	x11-wm/openbox
+	>=x11-misc/obconf-2.0.3_p20111019"
+
+pkg_postinst() {
+	elog "For your convenience you can review the LXDE Configuration HOWTO at"
+	elog "https://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml"
+}
diff --git a/media-libs/openglide/Manifest b/media-libs/openglide/Manifest
new file mode 100644
index 000000000000..7c96b2175596
--- /dev/null
+++ b/media-libs/openglide/Manifest
@@ -0,0 +1 @@
+DIST openglide-0.09_rc9_p20160913.tar.gz 450667 SHA256 136528469596e43595fd3e9a44e9b25b97e12617a3cee8469c8020b470a66cbd SHA512 4a64b74c2a96639d9fac732f72419ced652989b347b484f4abf7ac6a33d7b8d89ee56e6c04aaaf7475cae332b69a98ec0b7c58a9aac25a24d8acaad92392cb38 WHIRLPOOL 76e816031a01c700704bda1b7c6413ed8481412ca78f4b25852ca8a2bea3fb494ae14468b52de4ab499d8b2bf2e5c5ba85bdd3c30bdb956b22d95e5b2066e28e
diff --git a/media-libs/openglide/files/OpenGLid.ini b/media-libs/openglide/files/OpenGLid.ini
new file mode 100644
index 000000000000..d4ae7490a4bd
--- /dev/null
+++ b/media-libs/openglide/files/OpenGLid.ini
@@ -0,0 +1,26 @@
+Configuration File for OpenGLide
+
+Info:
+Priority goes from 0(HIGH) to 5(IDLE)
+Output resolution: 0 = original, 1.0-16.0 = scale factor, >16 = fixed width (height calculated automatically)
+Texture Memory goes from 2 to 32
+Frame Buffer Memory goes from 2 to 16
+All other fields are boolean with 1(TRUE) and 0(FALSE)
+
+Version=0.09rc9
+
+[Options]
+WrapperPriority=2
+CreateWindow=0
+InitFullScreen=1
+Resolution=0.0
+EnableMipMaps=1
+IgnorePaletteChange=0
+Wrap565to5551=1
+EnablePrecisionFix=1
+EnableMultiTextureEXT=1
+EnablePaletteEXT=1
+EnableVertexArrayEXT=0
+TextureMemorySize=32
+FrameBufferMemorySize=16
+NoSplash=1
diff --git a/media-libs/openglide/metadata.xml b/media-libs/openglide/metadata.xml
new file mode 100644
index 000000000000..b14a9fd7bc1b
--- /dev/null
+++ b/media-libs/openglide/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">voyageur/openglide</remote-id>
+		<remote-id type="sourceforge">openglide</remote-id>
+	</upstream>
+	<longdescription>
+	  OpenGLide is a Glide to OpenGL wrapper. It emulates a Voodoo
+	  board so you can run old DOS/Windows Glide games by translating
+	  Glide calls into OpenGL.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-libs/openglide/openglide-0.09_rc9_p20160913.ebuild b/media-libs/openglide/openglide-0.09_rc9_p20160913.ebuild
new file mode 100644
index 000000000000..15df0a8dfdc9
--- /dev/null
+++ b/media-libs/openglide/openglide-0.09_rc9_p20160913.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+COMMIT="3722fc563b737d2d7933df6a771651c2154e6f7b"
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="A Glide to OpenGL wrapper"
+HOMEPAGE="http://openglide.sourceforge.net/"
+SRC_URI="https://github.com/voyageur/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sdl static-libs"
+
+RDEPEND="virtual/glu:=[${MULTILIB_USEDEP}]
+	virtual/opengl:=[${MULTILIB_USEDEP}]
+	sdl? (
+		media-libs/libsdl:=[${MULTILIB_USEDEP}]
+	)
+	!sdl? (
+		x11-libs/libICE:=[${MULTILIB_USEDEP}]
+		x11-libs/libSM:=[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm:=[${MULTILIB_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+ECONF_SOURCE="${S}"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/openglide/sdk2_unix.h
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	econf \
+		--enable-shared \
+		--disable-sdltest \
+		$(use_enable sdl) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	insinto /etc
+	doins "${FILESDIR}"/OpenGLid.ini
+
+	exeinto /usr/share/${PN}
+	newexe platform/dosbox/glide2x.ovl glide2x-dosbox.ovl
+	newexe platform/dosemu/glide2x.ovl glide2x-dosemu.ovl
+
+	prune_libtool_files
+	einstalldocs
+}