Respect CFLAGS wrt bug #442282. Migrate to EAPI 5, improve dependencies, avoid building statically, and prune .la files.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

4 files changed, 94 insertions, 8 deletions

diff --git a/sci-misc/gcam/ChangeLog b/sci-misc/gcam/ChangeLog
index 816053aada22..062bc57c4306 100644
--- a/sci-misc/gcam/ChangeLog
+++ b/sci-misc/gcam/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-misc/gcam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/ChangeLog,v 1.6 2012/09/11 10:59:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/ChangeLog,v 1.7 2012/11/19 15:51:40 kensington Exp $
+
+*gcam-2010.07.27-r1 (19 Nov 2012)
+
+  19 Nov 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/gcam-2010.07.27-cflags.patch, +gcam-2010.07.27-r1.ebuild,
+  gcam-9999.ebuild:
+  Respect CFLAGS wrt bug #442282. Migrate to EAPI 5, improve dependencies, avoid
+  building statically, and prune .la files.
 
   11 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Drop maintainership
@@ -34,4 +42,3 @@
   20 Dec 2009; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   +gcam-2009.05.31.ebuild, +metadata.xml:
   New application, see bug 231227. Thanks to Renato Caldas, sedzimir, and Tommy[D].
-
diff --git a/sci-misc/gcam/files/gcam-2010.07.27-cflags.patch b/sci-misc/gcam/files/gcam-2010.07.27-cflags.patch
new file mode 100644
index 000000000000..12e89c48cb4d
--- /dev/null
+++ b/sci-misc/gcam/files/gcam-2010.07.27-cflags.patch
@@ -0,0 +1,14 @@
+--- configure.ac
++++ configure.ac
+@@ -66,9 +66,9 @@
+ AC_MSG_RESULT($want_debug)
+ if test "x$want_debug" = "xyes"
+ then
+-        export CFLAGS="-O2 -g -Wall -Wmissing-prototypes -pedantic -pg $extra_C_flags"
++        export CFLAGS="${CFLAGS} -Wall -Wmissing-prototypes -pedantic -pg $extra_C_flags"
+ else
+-        export CFLAGS="-O3 -std=gnu99 -Wmissing-prototypes -pedantic -ffast-math -fomit-frame-pointer $extra_C_flags"
++        export CFLAGS="${CFLAGS} -std=gnu99 -Wmissing-prototypes -pedantic $extra_C_flags"
+ fi
+ 
+ 
diff --git a/sci-misc/gcam/gcam-2010.07.27-r1.ebuild b/sci-misc/gcam/gcam-2010.07.27-r1.ebuild
new file mode 100644
index 000000000000..189da6e019da
--- /dev/null
+++ b/sci-misc/gcam/gcam-2010.07.27-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/gcam-2010.07.27-r1.ebuild,v 1.1 2012/11/19 15:51:40 kensington Exp $
+
+EAPI=5
+
+inherit autotools base
+
+DESCRIPTION="GNU Computer Aided Manufacturing"
+HOMEPAGE="http://gcam.js.cx"
+SRC_URI="http://gcam.js.cx/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	>=media-libs/libpng-1.5
+	virtual/opengl
+	virtual/glu
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-libpng15.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-static=no
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/sci-misc/gcam/gcam-9999.ebuild b/sci-misc/gcam/gcam-9999.ebuild
index ff5b6142e5be..ee31846fa6fd 100644
--- a/sci-misc/gcam/gcam-9999.ebuild
+++ b/sci-misc/gcam/gcam-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/gcam-9999.ebuild,v 1.2 2012/01/08 19:17:32 dilfridge Exp $
-
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gcam/gcam-9999.ebuild,v 1.3 2012/11/19 15:51:40 kensington Exp $
 
+EAPI=5
 ESVN_REPO_URI="http://gcam.js.cx/svn/gcam/trunk"
 ESVN_USER=gcam
 ESVN_PASSWORD=gcam
-inherit base autotools subversion
+
+inherit autotools base subversion
 
 DESCRIPTION="GNU Computer Aided Manufacturing"
 HOMEPAGE="http://gcam.js.cx"
@@ -17,14 +17,22 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libxml2
 	>=media-libs/libpng-1.5
+	virtual/opengl
+	virtual/glu
+	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:2
 	x11-libs/gtkglext
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 PATCHES=(
+	"${FILESDIR}/${PN}-2010.07.27-cflags.patch"
 	"${FILESDIR}/${PN}-2010.07.27-libpng15.patch"
 )
 
@@ -32,3 +40,12 @@ src_prepare() {
 	base_src_prepare
 	eautoreconf
 }
+
+src_configure() {
+	econf --enable-static=no
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}