Fix building stable version. Update to EAPI=3. Introduce static-libs. Drop unneeded patch.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

5 files changed, 50 insertions, 99 deletions

diff --git a/media-libs/gle/ChangeLog b/media-libs/gle/ChangeLog
index 47e48eb0488e..7710e021cfbc 100644
--- a/media-libs/gle/ChangeLog
+++ b/media-libs/gle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gle
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/ChangeLog,v 1.32 2011/01/05 07:14:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/ChangeLog,v 1.33 2011/01/05 08:47:06 scarabeus Exp $
+
+  05 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> gle-3.0.1-r2.ebuild,
+  gle-3.1.0-r1.ebuild, -files/configure-LANG.patch:
+  Fix building stable version. Update to EAPI=3. Introduce static-libs. Drop
+  unneeded patch.
 
   05 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> gle-3.0.1-r2.ebuild,
   gle-3.1.0-r1.ebuild:
diff --git a/media-libs/gle/Manifest b/media-libs/gle/Manifest
index 9a771093fc86..afa97e3005f8 100644
--- a/media-libs/gle/Manifest
+++ b/media-libs/gle/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
 AUX gle-3.1.0-autotools.patch 1533 RMD160 458a420786db8151856f82a1b42881c1a0c82de0 SHA1 c1b1f73ee43c55df0c1c5efe5884cdfdc92c5973 SHA256 f763daacaed6d1ac08931788ad32c70585800d4b3a610733e4b6ef56b33b3870
 DIST gle-3.0.1.tar.gz 705509 RMD160 3ee23fa37214273cbca493d6c72554a494c38dda SHA1 c3e2d79af8d2049314a4e31c40c583472c8701e1 SHA256 387d3d91e0493d93d88176fa096ba87b2fb16926719464329dc86b7bf436adbe
 DIST gle-3.1.0.tar.gz 806861 RMD160 49f217cf79ccc3c7e2802ae4347c15498f43db59 SHA1 ed6d7332df85357430b249854d4f2753f1228074 SHA256 dc8a74b5632b2c3fc84d33c2bf6ee43210b71b8ddf0a3166a25aeb46620bfa27
-EBUILD gle-3.0.1-r2.ebuild 943 RMD160 39dfdec44582cfd38580326aa7d3690d9bb563f1 SHA1 07cc92d3af420f6188e7f9185eb7c2398260c046 SHA256 3bdc1702e8283bd4412efe873e200c1546d3e850ac447fd876dd497f82e1471b
-EBUILD gle-3.1.0-r1.ebuild 1422 RMD160 5a0205b44f035ce300f2bd2607f15df84a5c019a SHA1 c4b08142a2aa0ea4187ddb2013a825b2348d4b07 SHA256 8f7cdad75d14a7a206eceb8000a732cd28430c2d3c1ef194861eff74a1642113
-MISC ChangeLog 4364 RMD160 10c91007177b2ea546a65fefac9743a9bb187dce SHA1 9d7536df658c870021a631e6ccce9b960f488e6e SHA256 041c1596aa465f9deead669e7f2ee9d3134c073461874b9f48cb6a0562ed3f93
+EBUILD gle-3.0.1-r2.ebuild 1238 RMD160 fd2a09f1eb4ea314b55eee8a6c390971364642ca SHA1 f836abc9b91a37e9364a58707d34414dce4725a6 SHA256 6eaebc4c6109a0a549179674618cec58d8bf1fe4a92cc74070e5847c7858eca8
+EBUILD gle-3.1.0-r1.ebuild 1397 RMD160 ba238241cf04ddbbf3d02259e3ed0ee9c38bbb1d SHA1 3cee336d1810a211f1a235b5607a6feaa48568a8 SHA256 1b336a389c02d393f2c11cf1660d4fb28beb44151a94c4f090204fa63696c6f1
+MISC ChangeLog 4587 RMD160 0009433a37b3935a7847c0e3e0221a88c1e5040a SHA1 035a297e931dd0d0bd547b4c042ddc189f302cf5 SHA256 70dc42d3ce3fb0e168da8ef0e345a05ac4eb23ffb394d93e386589e80593f7b2
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAk0kGmQACgkQIiMqcbOVdxRRxwP9F/GQt81vN3+i1r24pFqifFo+
-k0XgssVtbNQ3hUoA54YjQ0O3BagHk1sTssaeS6cuY/RhSLdS/9WOK+YwBz+bx+YP
-VL1g3BDuFbe7DfQT0MMl+KRMdfi4BqWzd1kCujSOMGXGlUHhVoLIup/TT/7i6ecK
-gHveq5B3SAetW9bvTLw=
-=j8ox
------END PGP SIGNATURE-----
diff --git a/media-libs/gle/files/configure-LANG.patch b/media-libs/gle/files/configure-LANG.patch
deleted file mode 100644
index 3ef76ef911c0..000000000000
--- a/media-libs/gle/files/configure-LANG.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- configure
-+++ configure
-@@ -54,6 +54,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/media-libs/gle/gle-3.0.1-r2.ebuild b/media-libs/gle/gle-3.0.1-r2.ebuild
index aeb83b0ea4dc..a8eae030787b 100644
--- a/media-libs/gle/gle-3.0.1-r2.ebuild
+++ b/media-libs/gle/gle-3.0.1-r2.ebuild
@@ -1,41 +1,46 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild,v 1.33 2011/01/05 07:14:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild,v 1.34 2011/01/05 08:47:06 scarabeus Exp $
 
-inherit eutils
+EAPI=3
+
+inherit autotools multilib
 
 DESCRIPTION="GL extrusion library"
 HOMEPAGE="http://www.linas.org/gle"
-SRC_URI="http://www.linas.org/gle/pub/gle-3.0.1.tar.gz"
+SRC_URI="http://www.linas.org/gle/pub/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
-IUSE=""
+IUSE="doc static-libs"
 
 DEPEND="virtual/opengl
-	virtual/glu
-	media-libs/freeglut"
-RDEPEND="${DEPEND}"
+	media-libs/freeglut
+	app-admin/eselect-opengl"
+
+src_prepare() {
+	# Replace inclusion of malloc.h with stdlib.h as needed by Mac OS X and
+	# FreeBSD. See bug #130340
+	sed -i -e 's:malloc.h:stdlib.h:g' src/*
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	# Don't build binary examples as they never get installed. See bug 141859
+	sed -i -e 's:examples::' Makefile.am
 
-	epatch "${FILESDIR}"/configure-LANG.patch
+	sed -i -e 's:SUFFIXES +=:SUFFIXES =:' man/Makefile.am public_html/Makefile.am
+	sed -i -e 's:CLEANFILES +=:CLEANFILES =:' man/Makefile.am
 
-	# Replace inclusion of malloc.h with stdlib.h as needed by Mac OS X and
-	# FreeBSD.
-	sed -i -e 's:malloc.h:stdlib.h:g' "${S}"/src/*
+	eautoreconf
 }
 
-src_compile() {
-	econf --with-x || die
-	emake || die
+src_configure() {
+	econf \
+		--with-x \
+		$(use_enable static-libs static) \
+		--x-libraries=/usr/$(get_libdir)/opengl/xorg-x11
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-	dohtml -r public_html
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS README
 }
diff --git a/media-libs/gle/gle-3.1.0-r1.ebuild b/media-libs/gle/gle-3.1.0-r1.ebuild
index 4c60ec0d9544..a59c0395bc11 100644
--- a/media-libs/gle/gle-3.1.0-r1.ebuild
+++ b/media-libs/gle/gle-3.1.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.1.0-r1.ebuild,v 1.10 2011/01/05 07:14:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.1.0-r1.ebuild,v 1.11 2011/01/05 08:47:06 scarabeus Exp $
+
+EAPI=3
 
 inherit autotools multilib
 
@@ -11,22 +13,22 @@ SRC_URI="http://www.linas.org/gle/pub/${P}.tar.gz"
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
+IUSE="doc static-libs"
 
 DEPEND="virtual/opengl
-	virtual/glu
 	media-libs/freeglut
 	app-admin/eselect-opengl"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# Replace inclusion of malloc.h with stdlib.h as needed by Mac OS X and
 	# FreeBSD. See bug #130340
 	sed -i -e 's:malloc.h:stdlib.h:g' src/* || die
 
+	# use proper docdir
+	sed -i -e 's:\$(datadir)/doc/gle:\$(datadir)/doc/${PF}:' doc/Makefile.am || die
+	sed -i -e 's:\$(datadir)/doc/gle/html:\$(datadir)/doc/${PF}/html:' doc/html/Makefile.am || die
+
 	# Don't build binary examples as they never get installed. See bug 141859
 	sed -i -e 's:examples::' Makefile.am || die
 
@@ -35,21 +37,14 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
-	econf --with-x --x-libraries=/usr/$(get_libdir)/opengl/xorg-x11
-
-	if use doc; then
-		sed -e 's:\$(datadir)/doc/gle:\$(datadir)/doc/${PF}:' \
-			-i doc/Makefile || die
-		sed -e 's:\$(datadir)/doc/gle/html:\$(datadir)/doc/${PF}/html:' \
-			-i doc/html/Makefile || die
-	fi
-
-	emake || die
+src_configure() {
+	econf \
+		--with-x \
+		$(use_enable static-libs static) \
+		--x-libraries=/usr/$(get_libdir)/opengl/xorg-x11
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-	rm -rf "${D}"/usr/share/doc/gle
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS README
 }