Backpatched fixes from 1.5.3. Fixed typo.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 83ea48208c7d6994b62952b3638b7e02a747c2f5..e143c142d88545a9553842bcdb81ca6f7853fc27 100644 (file)
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/postgis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.57 2011/08/23 22:46:51 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.58 2011/08/23 22:56:13 titanofold Exp $
+
+*postgis-1.4.2-r1 (23 Aug 2011)
+
+  23 Aug 2011; Aaron W. Swenson <titanofold@gentoo.org> -postgis-1.4.2.ebuild,
+  +postgis-1.4.2-r1.ebuild:
+  Backpatched fixes from 1.5.3. Fixed typo.
 
 *postgis-1.5.3-r1 (23 Aug 2011)
 

diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index f753c528e3e39cd1ac24aefd02ca259d21bf3fc6..9ac360d70972a4df255f2a436248ee572eb6d9bd 100644 (file)
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -13,19 +13,19 @@ DIST postgis-1.5.3.tar.gz 3779956 RMD160 e30275890b175cbe1d70d5899cbe45ec34ddbaf
 EBUILD postgis-1.3.1.ebuild 5288 RMD160 3a05746afeca4b09a0d4aa3e0b937518d432eb25 SHA1 77b8b8f7c6a0c1beef4abaa83cb73174f1fcf5e6 SHA256 5cd873726851e1727275d7fe473344951db02892c22de7cb10712ef0a3b3821d
 EBUILD postgis-1.3.6-r1.ebuild 5586 RMD160 d824f89bac4d74bdb2a526ae25ae3ae730c48697 SHA1 09368c82a2ff558bf449dd3454f74b7bc9ccc014 SHA256 3bcb7327811a4324ca9d73021170a525554544d8dc0aa942be06eba1284e563d
 EBUILD postgis-1.4.0.ebuild 5535 RMD160 d88ae3b22c6d56650e8473c33e944121da8e7e14 SHA1 0375209a5e716347818bc9da3300396c91ea4762 SHA256 f1d5082611460dd01e026d79e1e0ba7faa9554a17d1ed9cf4355af9a1a46ac28
-EBUILD postgis-1.4.2.ebuild 6651 RMD160 d4dcc75580c498da44ed9854bdd254528070e712 SHA1 d55e09405358de2f6295e540ee7f29d34d1e0477 SHA256 2e4704720e037e8754ba83fb33b733e88ed52eab7a9b7963c045755ae56beae2
+EBUILD postgis-1.4.2-r1.ebuild 6696 RMD160 0b9672fdd64eed9a7f203a2f340ab2a3cd4ec087 SHA1 60abe281b88bf0d8fbef20dced9cfdd957b878a8 SHA256 789cd4a5a6515f10946931330b4241c5bdd7f3a8519de059c290713532f2cc11
 EBUILD postgis-1.5.0-r1.ebuild 5949 RMD160 616de40fc630f742ce04c2f1d699369c7b7e368c SHA1 2e2242f20ad26b136927af98da14fd2d0c75262a SHA256 a958f14851095d90bd00dab8775ebb5de2a63377ec0fa134b7c8b122a4cbd341
 EBUILD postgis-1.5.0.ebuild 5554 RMD160 009a41a7162c935c7d321e5fb6d2a21d9b066270 SHA1 77c9bf519d40c0e497b9a8a28fbf337d070584fb SHA256 a3a6f2baa1c8deb9c8cc7dd91523e70ff48895e46ce748c521dc227afff8b023
 EBUILD postgis-1.5.2-r3.ebuild 7027 RMD160 794150f429f9c2587ec6dbc7fdccdf50e7ecda34 SHA1 bea14836cb1cb7936a6e65cfd9589108317179a5 SHA256 bcbba85d17e011faf1f0b0d60abac21f814d551c896f07b0d32c3e39756b401b
 EBUILD postgis-1.5.2.ebuild 5946 RMD160 5aa7c66101ba5faf4e309860fd56fb87e2709967 SHA1 b21b24835cce9a8dc7059dca551d161c098089e9 SHA256 3f9fef73adce04ee5f4582cb5c404da482b549230024a4326798b15fd42bbbae
 EBUILD postgis-1.5.3-r1.ebuild 6919 RMD160 c793d9600c9617c4024dfe4cfce7015a32686afe SHA1 7bba6c66f0c926d5036665129218f00f951da0c5 SHA256 3d65018c24746f74721ddff593afd41077e8189557f6cec31eebbd7b562644d5
 EBUILD postgis-1.5.3.ebuild 7023 RMD160 4e0cdd32268f8a9da26cfaffacc0749135c79cd7 SHA1 6a20b216440acecbdd801c33e8fc5346bfe4b937 SHA256 6b9d06a69aba974f630821a4fd69c4448e21718e3387378b79398b4ac99c2254
-MISC ChangeLog 8064 RMD160 f4161ed126e5f3f517f20ceada29b6dc3a845a30 SHA1 d3ce573654158b30aa88525e95432f3d15683880 SHA256 8bb80cd735f4c12fa7b935b0ef84c5d09494fc883d76dc8849c58ea4b5450798
+MISC ChangeLog 8249 RMD160 97a2c62725ce96fc3fcb1388112619f91d822972 SHA1 7dc371fd819b354cb877a675b578180a231533c6 SHA256 e1253ee78105f4286cc0094b70935f5bef22a145aaae9cd6873fe74cc0a2d24a
 MISC metadata.xml 481 RMD160 09ed331d86c1d68797aaf8a4912539f08f91cbb6 SHA1 a45afb667212035b630d417d2fc9632d99bbd62a SHA256 d0ab8dbe26001259f36c968e1d48ad5fda768227d99319cf4302af804a08d5ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5ULeEACgkQCOhwUhu5AEmMJgD+I+M+HhfDcERrK6Mv88P7uG2L
-vXN8DDWtDCjrNK87y+UA/0OuTkwSaD0hTo+1yUpJFNZUtLKOrewBL2FN8h2dLZDv
-=cbH3
+iF4EAREIAAYFAk5UMBMACgkQCOhwUhu5AEmGqAEAjGrwcnwtx4n0VSmV9tAKz7eh
+mtXHJClsKtT0qz2fgAwA/1c5UV7O/kPZ8Qzid9IduSSQrBlib/iqgSK0a+RfOZmy
+=Fx62
 -----END PGP SIGNATURE-----

diff --git a/dev-db/postgis/postgis-1.4.2.ebuild b/dev-db/postgis/postgis-1.4.2-r1.ebuild
similarity index 94%
rename from dev-db/postgis/postgis-1.4.2.ebuild
rename to dev-db/postgis/postgis-1.4.2-r1.ebuild
index 6940592320e4458bfa44681f5aa291d33008bdd5..d3ef2ce455bc1ee268d03786c7916cf308b151e2 100644 (file)
--- a/dev-db/postgis/postgis-1.4.2.ebuild
+++ b/dev-db/postgis/postgis-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.4.2.ebuild,v 1.1 2011/08/23 22:31:43 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.4.2-r1.ebuild,v 1.1 2011/08/23 22:56:13 titanofold Exp $
 
 EAPI="4"
 
@@ -41,6 +41,9 @@ RESTRICT="test"
 
 PGIS="$(get_version_component_range 1-2)"
 
+# not parallel safe
+MAKEOPTS+=" -j1"
+
 pkg_setup() {
        export PGSLOT="$(postgresql-config show)"
        if [[ ${PGSLOT//.} < 82 || ${PGSLOT//.} > 84 ]] ; then
@@ -52,30 +55,29 @@ pkg_setup() {
 
 src_configure() {
        # Configure interprets --without-gui as being the same as --with-gui
-       if use gtk ; then
-               econf --with-gui
-       else
-               econf
-       fi
+       local myargs=""
+       use gtk && myargs+=" --with-gui"
+       econf \
+               ${myargs}
 }
 
 src_compile() {
        # Occasionally, builds fail because of out of order compilation.
        # Otherwise, it'd be fine.
-       emake -j1
+       emake
        cd topology/
-       emake -j1
+       emake
 
        if use doc ; then
                cd "${S}/doc/"
-               emake -j1
+               emake
        fi
 }
 
 src_install() {
-       emake -j1 DESTDIR="${D}" install
+       emake DESTDIR="${D}" install
        cd topology/
-       emake -j1 DESTDIR="${D}" install
+       emake DESTDIR="${D}" install
 
        cd "${S}"
        dodoc CREDITS TODO loader/README.* doc/*txt
@@ -111,7 +113,7 @@ pkg_postinst() {
 
 pkg_config(){
        source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-       source "${EROOT%/}/etc/postgis_dbs"
+       source "${EROOT%/}/etc/postgis_dbs-${PGIS}"
        local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
 
        if [[ -n ${configured} ]] ; then