Make static library configureable.

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

diff --git a/sci-libs/proj/ChangeLog b/sci-libs/proj/ChangeLog
index f7aefd25221f31f5e3deb935717b310e6d771d8a..1c2446a13292490ccf249c32f7543d3d1ae221d0 100644 (file)
--- a/sci-libs/proj/ChangeLog
+++ b/sci-libs/proj/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/proj
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/ChangeLog,v 1.18 2010/01/02 18:15:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/ChangeLog,v 1.19 2010/04/26 22:03:06 scarabeus Exp $
+
+  26 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> proj-4.7.0.ebuild:
+  Make static library configureable.
 
   02 Jan 2010; Christian Faulhammer <fauli@gentoo.org> proj-4.7.0.ebuild:
   Transfer Prefix keywords

diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 40990fe889da858501af6b2066ba5f85adb0b728..f463d476ec97515e28a1e0703447523aed93a630 100644 (file)
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -15,13 +15,13 @@ EBUILD proj-4.4.9.ebuild 999 RMD160 30326269847342b76ec1327026d7636d48feaded SHA
 EBUILD proj-4.5.0.ebuild 981 RMD160 051fd20edcf097ea9b07eb9954b316e9cfcb2f83 SHA1 3b62dece4c69392852bff324eca75876b898b49e SHA256 25e5e7e91efa584f4eebb4aa44bf788face8a96efe098f63b31cd7ecd724267e
 EBUILD proj-4.6.0.ebuild 992 RMD160 34627f9cbc90b4eb63fcd0d1e96fd3ddcb6ebdaf SHA1 411ebd642638f45ce248757eb7a0ac5627e664f1 SHA256 77fcac4c3251218a157f7dc60a7ac4cb2aa555087d13af1a139a25580f3a40cb
 EBUILD proj-4.6.1.ebuild 1037 RMD160 c6c4d436f365e90f2a7f5cb330bde1e88c18b1db SHA1 feb307ce22c9bd00c3c5a866ef92d746621fed21 SHA256 40ff3666d7490dd6ad63e86c26f9be7c96b9189052c25200bf945e4f51d47437
-EBUILD proj-4.7.0.ebuild 1085 RMD160 1f10914acfc52d0855296b4051cfe1dbfb4fc42a SHA1 b45f59e0d148f9172e5872d33326f64502a3ec5e SHA256 f337a6cac7c5ba558f7d04072e4d55a28798e0bbfda42a343cd73cbb89959b90
-MISC ChangeLog 4333 RMD160 3733a4606a3a932e9c6a1b073a0e9b868bdd260b SHA1 a325267ca4e6e4f6a48ac499c0a9feb369bc19dc SHA256 54ab441f2624fbafcfefbbb8a872bafa1ec3b677486da0b5acb0ea0195ae251a
+EBUILD proj-4.7.0.ebuild 1105 RMD160 d830fdff526a569ed95eb392d981eba950165ca3 SHA1 a1095a151d888dd4840b90ca299b5fe068bfb27c SHA256 139692192b19602d05784ff379a9ec4d797f346a84c7c20c6c30e9cd97ade072
+MISC ChangeLog 4449 RMD160 ece7fb1a474418114bfce9e70565cbfe582715ae SHA1 4408d411329bc7874bcd990e2624d94fd5f1b32c SHA256 0bd0e537c2a3d87b15c97e2130d75e9a367c5833f9c10a7a6137041027044580
 MISC metadata.xml 442 RMD160 3c26b5b2f96e807ada5c51ac4f2d9f2478e1ddd9 SHA1 3ef6f25969eab83a6b92b38bd8b31253f351286d SHA256 64f19b0331a3d251908e130355c8be99c627c2048e712d52e1c7f0942f49b7de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAks/jTYACgkQNQqtfCuFnePTBACgmSdYGKqGwCRWbxKJnTxmGxi0
-fIAAn2RiiPSj3bc58IqeXDtF96FShMC1
-=5Dlg
+iEYEARECAAYFAkvWDYYACgkQHB6c3gNBRYcCjACgsP14BwVQV99EOLCAOKwbWH2i
+fYcAn23ORQv60WBDKZsqILWs3Wparj9N
+=o0n2
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/proj/proj-4.7.0.ebuild b/sci-libs/proj/proj-4.7.0.ebuild
index 1d4e8789c4963fb7729dd4cc84a7878ed4e74f05..e8f7be3150738e5d9ae878f765fc37bdb7964916 100644 (file)
--- a/sci-libs/proj/proj-4.7.0.ebuild
+++ b/sci-libs/proj/proj-4.7.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.7.0.ebuild,v 1.3 2010/01/02 18:15:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/proj/proj-4.7.0.ebuild,v 1.4 2010/04/26 22:03:06 scarabeus Exp $
 
-inherit eutils
+EAPI="3"
+inherit base
 
 DESCRIPTION="Proj.4 cartographic projection software with updated NAD27 grids"
 HOMEPAGE="http://trac.osgeo.org/proj/"
@@ -12,21 +13,25 @@ SRC_URI="ftp://ftp.remotesensing.org/pub/proj/${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
+IUSE="static-libs"
 
 RDEPEND=""
 DEPEND="app-arch/unzip"
 
 src_unpack() {
        unpack ${P}.tar.gz || die
-       cd "${S}"/nad
-       mv README README.NAD
+       cd "${S}"/nad || die
+       mv README README.NAD || die
        unpack ${PN}-datumgrid-1.5.zip || die
-       #epatch "${FILESDIR}/${P}-test.patch"
+}
+
+src_configure() {
+       econf \
+               $(use_enable static-libs static)
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       base_src_install
        dodoc README NEWS AUTHORS INSTALL ChangeLog nad/README.{NAD,NADUS}
        cd nad
        insinto /usr/share/proj