media-libs/sg: Handle static libs

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

3 files changed, 31 insertions, 28 deletions

diff --git a/media-libs/sg/ChangeLog b/media-libs/sg/ChangeLog
index 0908d3f7813c..562f4a1f2967 100644
--- a/media-libs/sg/ChangeLog
+++ b/media-libs/sg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/sg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/ChangeLog,v 1.6 2012/02/13 20:33:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/ChangeLog,v 1.7 2012/05/02 10:33:43 jlec Exp $
+
+  02 May 2012; Justin Lecher <jlec@gentoo.org> sg-1.5.ebuild:
+  Handle static libs
 
   13 Feb 2012; Justin Lecher <jlec@gentoo.org> sg-1.4.ebuild, sg-1.5.ebuild:
   Add alternative to mase[motif] -> libGLw
diff --git a/media-libs/sg/Manifest b/media-libs/sg/Manifest
index 5e0532471786..40d2cbfec0c4 100644
--- a/media-libs/sg/Manifest
+++ b/media-libs/sg/Manifest
@@ -6,13 +6,13 @@ AUX 1.4-opengl.patch 2304 RMD160 d05d3da21999311c6a21cc1e86a49f4be72b4f8c SHA1 a
 DIST sg-1.4.tar.gz 2860654 RMD160 b1a6a774ccffcd1b9c57917b51f73feba5e08da8 SHA1 1dc69218b85e076adb4ae587021c0d5327e1d291 SHA256 1f4199a97630b68dff6b19db482a327ef3e0f0153891391704b5f97a8090fc04
 DIST sg-1.5.tar.gz 2859299 RMD160 8550b747dbdd7c87a9d6451fb9e944c0c66ebe6b SHA1 41a5248614bf86c17440bb0c233bb23eb94d5ecf SHA256 e7d499c33b87bd50c4b83b84e23a2aebd70ed01a3c9a7f4512d36216da487784
 EBUILD sg-1.4.ebuild 1764 RMD160 4d3649060f2098a4a7afb7b1f7047e78cecf53ba SHA1 15e4647aba4a95500b39bef8d6f8ed5d34c1aa55 SHA256 5d6aeafa48f8635b1f9e402a4efc86b1bdd28c00d314ac1df3da9a8029f061f3
-EBUILD sg-1.5.ebuild 1760 RMD160 9ff89d68712c8978d26bdc60f3ef85fe90ed305b SHA1 5d510cebc9bd83185fc2147652e5c49da7f7f1bc SHA256 789481a7b231e70a3ffccd4f7d471431ce46f2a7091721a9bd1486b79bb0c288
-MISC ChangeLog 963 RMD160 89bdcafbb30750b58679dea3a21a6a5d0a54cb13 SHA1 60f45e3dd0e89611946ea8516fcdd83fdf06d80a SHA256 45d14d117fc3aac0c7a91c51346ba5b87377290ce56b8e3ecd906bcf683dec7b
+EBUILD sg-1.5.ebuild 1769 RMD160 8e243948991f004da84f7b36e7f3a8b8f12a234b SHA1 1b97dcf87924c5d512c8f229681cdc72ead7ca64 SHA256 bcd20ad861b88ed66ceeba21b3e2d9af07c924f23e8b39bfa7f5246fb27df0af
+MISC ChangeLog 1047 RMD160 f5647f3c21c7e04f0a33ea8cb220df3ff2b44388 SHA1 11819255df39d78569f4d74765dd6e080dfce751 SHA256 a487338e77152a1d064f3289b00ecd79f0a8f0d171b4be444f9cf071cce19fcd
 MISC metadata.xml 219 RMD160 e9da2d4271f89b9dbac478d145a519318f0f3314 SHA1 6d4a101013d6a40cd61cb2d8c6b517c443013bc7 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk85c5wACgkQgAnW8HDreRZYvQCgv6KesnqfX1R6nnCuEvaxINgw
-T9EAniKXtAPnWtLpm672rS+2yBroAJTd
-=Cwhb
+iEYEAREKAAYFAk+hDYwACgkQgAnW8HDreRbEMQCgib3y1M2pnqeIzCpz+L7v0Tfl
+TIUAn0tSp5snhhJgCJcNGCS5A/x1SDJj
+=Nt7Z
 -----END PGP SIGNATURE-----
diff --git a/media-libs/sg/sg-1.5.ebuild b/media-libs/sg/sg-1.5.ebuild
index 82adb26808b8..4029e4349983 100644
--- a/media-libs/sg/sg-1.5.ebuild
+++ b/media-libs/sg/sg-1.5.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.5.ebuild,v 1.3 2012/02/13 20:33:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sg/sg-1.5.ebuild,v 1.4 2012/05/02 10:33:43 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit autotools eutils multilib
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils multilib
 
 DESCRIPTION="Socket Graphics tool for displaying polygons"
 HOMEPAGE="http://fetk.org/codes/sg/index.html"
@@ -13,7 +15,7 @@ SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
-IUSE="doc opengl"
+IUSE="doc opengl static-libs"
 
 RDEPEND="
 	dev-libs/maloc
@@ -33,18 +35,20 @@ DEPEND="
 
 S="${WORKDIR}"/${PN}
 
+PATCHES=(
+	"${FILESDIR}"/1.4-opengl.patch
+	"${FILESDIR}"/1.4-doc.patch
+	)
+
 src_prepare() {
-	rm src/{gl,glu,glw} -rf
-	epatch \
-		"${FILESDIR}"/1.4-opengl.patch \
-		"${FILESDIR}"/1.4-doc.patch
-	eautoreconf
+	rm src/{gl,glu,glw} -rf || die
+	autotools-utils_src_prepare
 }
 
 src_configure() {
 	local sg_include
 	local sg_lib
-	local myconf
+	local myeconfargs
 
 	sg_include="${EPREFIX}"/usr/include
 	sg_lib="${EPREFIX}"/usr/$(get_libdir)
@@ -59,17 +63,13 @@ src_configure() {
 	export FETK_GL_INCLUDE="${sg_include}"/GL
 	export FETK_MOTIF_INCLUDE="${sg_include}"
 
-	use doc || myconf="${myconf} --with-doxygen= --with-dot="
+	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
 
-	use opengl && myconf="${myconf} --enable-glforce --enable-gluforce --enable-glwforce"
-
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--disable-triplet \
-		--enable-shared \
-		${myconf}
-}
+	use opengl && myeconfargs+=( --enable-glforce --enable-gluforce --enable-glwforce )
 
-src_install() {
-	emake DESTDIR="${D}" install || die
+	myeconfargs+=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--disable-triplet
+	)
+	autotools-utils_src_configure
 }