[gentoo-commits] gentoo-x86 commit in sci-geosciences/mapserver: mapserver-5.4.2-r1.ebuild

[gentoo-commits] gentoo-x86 commit in sci-geosciences/mapserver: mapserver-5.4.2-r1.ebuild

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    10/12/23 11:14:50

  Modified:             mapserver-5.4.2-r1.ebuild
  Log:
  distutils_src_compile() internally calls die().
  
  (Portage version: 2.2.0_alpha10_p4/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild?r1=1.1&r2=1.2

Index: mapserver-5.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mapserver-5.4.2-r1.ebuild	23 Dec 2010 09:28:02 -0000	1.1
+++ mapserver-5.4.2-r1.ebuild	23 Dec 2010 11:14:50 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild,v 1.1 2010/12/23 09:28:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild,v 1.2 2010/12/23 11:14:50 arfrever Exp $
 
 EAPI="2"
 
@@ -165,7 +165,7 @@
 
 	if use python; then
 		cd_script python ${step}
-		distutils_src_compile || die "Unable to build python mapscript"
+		distutils_src_compile
 	fi
 
 	if use ruby; then

[gentoo-commits] gentoo-x86 commit in sci-geosciences/mapserver: mapserver-5.4.2-r1.ebuild

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    11/04/12 18:20:57

  Modified:             mapserver-5.4.2-r1.ebuild
  Log:
  Call Python-related functions only with USE="python".
  
  (Portage version: 2.2.0_alpha29_p17/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild?r1=1.6&r2=1.7

Index: mapserver-5.4.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mapserver-5.4.2-r1.ebuild	2 Mar 2011 20:36:03 -0000	1.6
+++ mapserver-5.4.2-r1.ebuild	12 Apr 2011 18:20:57 -0000	1.7
@@ -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/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild,v 1.6 2011/03/02 20:36:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-5.4.2-r1.ebuild,v 1.7 2011/04/12 18:20:57 arfrever Exp $
 
 EAPI="2"
 
@@ -68,6 +68,7 @@
 	use java && java-pkg-opt-2_pkg_setup
 	use perl && perl-module_pkg_setup
 	use php && has_php
+	use python && python_pkg_setup
 
 	confutils_use_conflict gdal tiff
 	confutils_use_depend_all java threads
@@ -287,9 +288,13 @@
 
 pkg_postinst() {
 	webapp_pkg_postinst
-	distutils_pkg_postinst
+	use python && distutils_pkg_postinst
 }
 
 pkg_prerm() {
 	webapp_pkg_prerm
 }
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}