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

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 106 insertions, 24 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/Manifest b/sci-misc/gcam/Manifest
index 5f43a1842ac3..3a45a6c92a68 100644
--- a/sci-misc/gcam/Manifest
+++ b/sci-misc/gcam/Manifest
@@ -1,26 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gcam-2010.07.27-cflags.patch 523 SHA256 f792cafdaad66f913b43ebee2de1dd206cfb631caabfb0442fbd2be791cc3b39 SHA512 f443897b1e9d67acdf71d8bfbd19c14d31a8422e33524ae56bda3d6b614faf7f752a088f9b2532b0f9fb338e04579b1e29784a680d49cce668c4f714c5585a25 WHIRLPOOL f5e62504b6cfcb02a842f35f06ea9b53cc4e482a2756ec42e70bc1d5b377ca1ab5e380641535ce004403152c9f7a9304ea573488ee4f34cbbb70459b854b4f3c
 AUX gcam-2010.07.27-libpng15.patch 1334 SHA256 ebade43b9934b73761c235d5141153637d0a7bc376351aa95b28a220865fb40c SHA512 9efb0ae2227b53df8ab17c8f8814857c7e65998eb4f10ca8d4cdbbf615fa7fbc3588276d4b3ec6724f2a31217856068e1d6e076f9371e55a8d44ffbeaa9291f3 WHIRLPOOL 5a06e9333127d7afefb036f0c466a87fe3e364374a76cb2f1b9b113fab623ead17877a0a133ce7b4ad85e4e94b80a890b7802334191900a02c67e04058358c2a
-DIST gcam-2010.07.27.tar.gz 554771 SHA256 9e4eaf1933aed72316c162b5fff86e00d5df1478fcebd65b9621e552a0a42ccf
+DIST gcam-2010.07.27.tar.gz 554771 SHA256 9e4eaf1933aed72316c162b5fff86e00d5df1478fcebd65b9621e552a0a42ccf SHA512 85a47d82bbd634a4a369d6b3a68bce0f6a147e1d4ee220742a2d7b60db7d29dd7e35abc3e0c91ed43cf79d29c0865434d502d3724091e129acb6c587c6184ac9 WHIRLPOOL f79c7addc1845c16c500f26603577500b3a9c7ddd65d3e853d82ea7b30786cc2450a92e91f32a8d0bd38ae54fbede91aa00021df778f51ddbf7268ba5ba366d0
+EBUILD gcam-2010.07.27-r1.ebuild 860 SHA256 662fd73645e7daf20e11addd9903de67f013b00eecc1e2a1940f612fcb6024e4 SHA512 59e8c3b79baa36b8ffb5bd6fd8e4db66e946ac281a196e428e3021010a5db057c11bab56b5dc16e1dda2e727d89ec443a27a1a61753c2d77c67c208ec556f4ff WHIRLPOOL c0e5d0650d14aec66488431d9b1a72176da6e84ccdc71a49ce8e6f10758902cf2f3d1c66ca290cdefcc220ed2c367f9317a7c236b7cc6d3079715e6c06392c7f
 EBUILD gcam-2010.07.27.ebuild 565 SHA256 4515f6f3533adf47eb0974c7434bdbd704b57fd04be14ca270a691dac128e5ef SHA512 9f73aebf21c16f0d0a931240dbb58135e7e7efb84ecc9420ade6caafb65bd82e0b2811774ebaf0df41384d0b6f3207a5af7fefc92114f07b578e0d425df8682c WHIRLPOOL b3f78f1626f07ce97b8f6ca47d4edb30df58b93a5699d880c46351b5c5f1cec600663917fa2941ed284ed8c308d006a1542820afe2419a39a429b72dce12c715
-EBUILD gcam-9999.ebuild 667 SHA256 97293d084d513501a52ac2b56b847143495444dfd526ea0a5c7fd92a1a91ec2a SHA512 fa01c010bea5e50dcc3b769dbb2b14bbdfdefcb61151748a834c2f86b33714e3501827471acdce90914446d4dd606c3bf84b83147763af974890f575b183a6cf WHIRLPOOL 15ff6cf1c53c410470a294b1818d035e48c9759e7b0a677f6857ec9e113ce852de70a2ebcd86714145d4fe8a30477936642482222c5909744d39fed33a3c1306
-MISC ChangeLog 1270 SHA256 201ba707c68e366f7e1178be3517220acd62d582bded7955276438f0cc0542cd SHA512 fc38c7dab5bdb40bdff834ed7287ecb6b8b8e75d3b2c190478d4962dff2b6bc46702166a85f6d06b51ea3f8995d93fe507e4878d804ebbc2f8175bd9d15d6fc9 WHIRLPOOL 87788edb394408b24ea51fff7c61abab81fa4eb086e20885097d62b99dc75345b27b11e08255a175e469f9a496d9ba512c828e50a1b7a4a8a26e9536a94f7b99
+EBUILD gcam-9999.ebuild 930 SHA256 f10e940575a009b672e8c9c1e0261cd4a6358961139af12162a9cbc7b2a80dae SHA512 8a9cc46c2856fa6c2f4f1cb76851d4b98f353f5a72ff00312b654d8bbf30a15f16bc373669fe4d34a7cb4f30b98a09d41c048d1bf60dfb29c048eedc909bd0ba WHIRLPOOL bacea18720e8b4de368836aefd61f54d6b933a03a3bb13e9b4fd9a1467656c0a2e3c3c0e82a0f276e0acf2632755c5c1dc1d655a15f170c6407cc94c7bfee83c
+MISC ChangeLog 1574 SHA256 0725e6256f3eba94f1bd149f8e16c916d3e86e4404c24336b30b842f3d693178 SHA512 39f72ac8902487f4477db273d00462bd3c5fcb7cdae95e50b933a984401ee35bdb151234af4661703b0db452922da5e02e5c080465464b4a9d635b1598f62a19 WHIRLPOOL e5e9fc466cd29f0b8642582c52eaf509c6cb2d205e178b7c5caa99b64a2997fa7e2f7c76fd6ca6fd7a882371c0d019ac7b5b617a7ad066e6c547474fdab0d0c4
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQTxn0AAoJEEb+UGWnxTyH8hEP/jXYjVUfmm4vFgL2eZMky4wg
-M//uMZBpBPWX4jaUHi9ca983tugQFEa19oiBMNErz+GjB/8wKd50yaUKQgkO6uwT
-QhHHcUc/LopK48C7C6KyClgOReyc0Bie62nBlO3/wubBmF1/cxE1pFPlk0CmcWba
-6+rj0AdTEoxNEJ2zRkgzXZg1q5PXUD0nWRm6ZSnGBIdtoty2FVeTXTRpFWwv/1Ws
-+m0DDlo+kqIehE5JreUWjLb+tWc6f1Bni3BZe2gFLd6Eg3XI/+C5gP2hHpYlbD7b
-GLWEJv2mWP+u6pOxZ+59Yxgk6K8J/g5r05uJ3zN9ZJC+3/45cobec6w4zDBuk4lz
-9KxyE0jYSmePO4x2FWbbz2X7Ryo0sgFxYa0oKAcXhhcnMHPbIilI5ku7nwLN5r2z
-gL7wd22VqjWgwkPQ5mjeXlunu85wBRMTHazlcADPmwo8WznNgbaR5sPTmjEUfBu3
-+ELhIxAPZfRM/edLHdzSg1Q+mBc69eywshy42X6yC+VtERIgkT//Ntz6+nt8faAS
-APvanjTF638+raP0lpcJXhDunYW2/pyY6lrcNEcoJ4tWO9eUB7LrT2pZ667GlP5f
-7JVTUgGLVlhoW7Q0e+F/+vbHnFFfZzHsC1Ao+ByRzZ00gfdCXyYlpNMkP3snMWMl
-NU6yF1K2Uv2xo0kRm78D
-=uQi9
+iQEcBAEBCAAGBQJQqlUnAAoJEMbwO6tnXQ0sqAgH/jtD40g67+xE3m0PzR4xfeTc
+RkaDhWtozIh7M2gD2oS7QQTRu7bn9ribWaaxY3iEPg841JG8WtnOTYYDRdpr9yaU
+U4pTj6CHaJ+arP+Zkdpop0SJObRURdh0TODl8L4I2aMM9XhVa6EylKhu88Dc6ypI
+9e9FNY/dBshxuLy+Nfluf5XEXyJTlGAcCznLipDDj6jnNGcPji4Rjrqs9O/vOuL2
+N2LPO387Ev71HZ/nbsSsqkIIkr0lZlDdYnuqRAAhYqO+rIsTA8lWCr1Tmha9P8Fj
+fIwI2PGbqpoafxkWUvzCXZ15LpU0HLkB3mGi2rbPqRYshpm+zZkj55tDtSdaOu8=
+=GYEo
 -----END PGP SIGNATURE-----
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
+}