Use system libltdl wrt #252403, thanks to Diego E. 'Flameeyes' Pettenò for reporting.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 137 insertions, 3 deletions

diff --git a/games-arcade/emilia-pinball/ChangeLog b/games-arcade/emilia-pinball/ChangeLog
index d32ff80fedc2..83c910489dfb 100644
--- a/games-arcade/emilia-pinball/ChangeLog
+++ b/games-arcade/emilia-pinball/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-arcade/emilia-pinball
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/ChangeLog,v 1.16 2009/06/24 23:39:15 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/ChangeLog,v 1.17 2010/03/05 18:41:15 ssuominen Exp $
+
+*emilia-pinball-0.3.1-r1 (05 Mar 2010)
+
+  05 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +emilia-pinball-0.3.1-r1.ebuild,
+  +files/emilia-pinball-0.3.1-libtool.patch:
+  Use system libltdl wrt #252403, thanks to Diego E. 'Flameeyes' Pettenò
+  for reporting.
 
   24 Jun 2009; Michael Sterrett <mr_bones_@gentoo.org>
   +files/emilia-pinball-0.3.1-glibc210.patch, emilia-pinball-0.3.1.ebuild:
diff --git a/games-arcade/emilia-pinball/Manifest b/games-arcade/emilia-pinball/Manifest
index 3435e3dcd081..054178ec34bc 100644
--- a/games-arcade/emilia-pinball/Manifest
+++ b/games-arcade/emilia-pinball/Manifest
@@ -1,5 +1,7 @@
 AUX emilia-pinball-0.3.1-glibc210.patch 379 RMD160 af16d019329c553a9d22cc5dbfdbf7907d5f03b2 SHA1 70e79bb369138d132ce93edd839c373301621e1e SHA256 7947e7c4327b339185da9d87c83fdf9c03d43d6dcb678b93d67b36de116f94da
+AUX emilia-pinball-0.3.1-libtool.patch 2371 RMD160 0ff67e10b1c120106452e8c2323cd8ebf243de86 SHA1 2641f91e8df2fd8cad0775535c37a198ad49edaf SHA256 05a344ecb84435c60286628dcf447e893138e63723f839160eb980bfe8d1ae34
 DIST pinball-0.3.1.tar.gz 6082982 RMD160 ba85469c9f53f7a0a46ab26aa4e45666b2dca806 SHA1 7daf63a7b7e586ede2a6ffae3e53abd0e23fff22 SHA256 ba47989f7fb6e294faa95285563220c8b01c3dbb9aa1bc29828eb7e832855cb8
+EBUILD emilia-pinball-0.3.1-r1.ebuild 1591 RMD160 a019bf156e95b810bacb06896f15ee1fe01328ad SHA1 d02cccf8321c89dfd7feed9ba6edd644193226bf SHA256 267be2dad15195d2185e566a80189f1b8488040bad1bb93dd2d37f7716e4c61c
 EBUILD emilia-pinball-0.3.1.ebuild 1467 RMD160 ca84e94dbdf1416e8e87e5cd601d96d3c01c715e SHA1 a6e2cf5caa1b3f57440eb9427c35976d922e9ad7 SHA256 31b3ee536f466078fe3e40db63712bacc5495766fdd3864a5c948d29219c7a0d
-MISC ChangeLog 2481 RMD160 917e7bb0d4555371cedd14bca90cf278f6b4e88e SHA1 e62c19a5c8248a23f2f153cf00b477377ad16d10 SHA256 72bfaa05dc6fec2fad9cc25a01ddf0c804c16356eafbd587664d29a11880f63e
+MISC ChangeLog 2747 RMD160 2ad8da25abf322e8cc93429ca2851d746751b888 SHA1 d9ea9c24fea2614a3a81077be3696f9e1149ae2b SHA256 bad0d439d4e4ca171e99fad3b2c652335f3134da5bee16734f5e3e6662d1975b
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..f7d58c4503bd
--- /dev/null
+++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild,v 1.1 2010/03/05 18:41:15 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils games
+
+MY_PN=${PN/emilia-/}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="SDL OpenGL pinball game"
+HOMEPAGE="http://pinball.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pinball/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/opengl
+	x11-libs/libSM
+	media-libs/libsdl[opengl,video,X]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	>=sys-devel/libtool-2.2.6b"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc210.patch \
+		"${FILESDIR}"/${P}-libtool.patch
+	rm -rf libltdl
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf --with-x
+}
+
+src_compile() {
+	emake -j1 CXXFLAGS="${CXXFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dodoc README || die "dodoc failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dosym "${GAMES_BINDIR}"/pinball "${GAMES_BINDIR}"/emilia-pinball
+	mv "${D}/${GAMES_PREFIX}/include" "${D}/usr/" \
+		|| die "mv failed (include)"
+	dodir /usr/bin
+	mv "${D}/${GAMES_BINDIR}/pinball-config" "${D}/usr/bin/" \
+		|| die "mv failed (bin)"
+	sed -i \
+		-e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \
+		"${D}"/usr/bin/pinball-config || die "sed failed"
+	newicon data/pinball.xpm ${PN}.xpm
+	make_desktop_entry emilia-pinball "Emilia pinball"
+	prepgamesdirs
+}
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch
new file mode 100644
index 000000000000..437e4eb684a4
--- /dev/null
+++ b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch
@@ -0,0 +1,64 @@
+diff -ur pinball-0.3.1.orig/configure.ac pinball-0.3.1/configure.ac
+--- pinball-0.3.1.orig/configure.ac	2003-11-21 09:40:18.000000000 +0200
++++ pinball-0.3.1/configure.ac	2010-03-05 20:41:24.000000000 +0200
+@@ -14,18 +14,13 @@
+ CFLAGS="-g -W -Wall -O2"
+ CXXFLAGS="-g -W -Wall -O2"
+ 
+-AC_CONFIG_SUBDIRS(libltdl)
+-
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+-AC_LIBTOOL_DLOPEN
+-AC_LIBLTDL_CONVENIENCE
+-AC_PROG_LIBTOOL
+ 
+-AC_SUBST(INCLTDL)
+-AC_SUBST(LIBLTDL)
++LT_PREREQ([2.2.6])
++LT_INIT([dlopen])
+ 
+ dnl *******************************************
+ dnl PATHS AND DIRS ****************************
+diff -ur pinball-0.3.1.orig/Makefile.am pinball-0.3.1/Makefile.am
+--- pinball-0.3.1.orig/Makefile.am	2003-12-10 12:15:35.000000000 +0200
++++ pinball-0.3.1/Makefile.am	2010-03-05 20:36:48.000000000 +0200
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = gnu
+ 
+-SUBDIRS = libltdl addon base data src test
++SUBDIRS = addon base data src test
+ 
+ EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop
+ 
+diff -ur pinball-0.3.1.orig/src/Makefile.am pinball-0.3.1/src/Makefile.am
+--- pinball-0.3.1.orig/src/Makefile.am	2003-11-20 18:46:17.000000000 +0200
++++ pinball-0.3.1/src/Makefile.am	2010-03-05 20:37:08.000000000 +0200
+@@ -7,9 +7,9 @@
+ 
+ pinlib_LIBRARIES = libemilia_pin.a
+ 
+-INCLUDES = -I../base -I../addon @INCLTDL@
++INCLUDES = -I../base -I../addon
+ 
+-pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
++pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
+ pinball_LDFLAGS = -export-dynamic
+ 
+ pinball_SOURCES = Pinball.cpp
+diff -ur pinball-0.3.1.orig/test/Makefile.am pinball-0.3.1/test/Makefile.am
+--- pinball-0.3.1.orig/test/Makefile.am	2003-11-20 18:46:17.000000000 +0200
++++ pinball-0.3.1/test/Makefile.am	2010-03-05 20:36:38.000000000 +0200
+@@ -6,8 +6,8 @@
+ noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
+ dnl noinst_PROGRAMS = unittest
+ 
+-INCLUDES = -I../base -I../addon -I../src @INCLTDL@
+-LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
++INCLUDES = -I../base -I../addon -I../src
++LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
+ 
+ testlib_LTLIBRARIES = libModuleTest.la
+