public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/
Date: Tue, 30 Jul 2024 21:13:31 +0000 (UTC)	[thread overview]
Message-ID: <1722373912.0343e050e71f1abb84c923c5566914741f02b100.pacho@gentoo> (raw)

commit:     0343e050e71f1abb84c923c5566914741f02b100
Author:     Marco Genasci <fedeliallalinea <AT> gmail <DOT> com>
AuthorDate: Tue Jun 25 07:44:47 2024 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 21:11:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0343e050

sci-geosciences/mapserver: bump version to 8.0.2

- fix compilation errors with libxml2 2.12
- add java mapscript support
- update python target to 3.12 / remove egg-info
- update to EAPI 8

Closes: https://bugs.gentoo.org/924292
Closes: https://bugs.gentoo.org/929767
Signed-off-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37288
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 sci-geosciences/mapserver/Manifest               |   1 +
 sci-geosciences/mapserver/mapserver-8.0.2.ebuild | 227 +++++++++++++++++++++++
 2 files changed, 228 insertions(+)

diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 8f0bfa381bf8..7ac053ae9167 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1 +1,2 @@
 DIST mapserver-8.0.1.tar.gz 2950164 BLAKE2B 5b14006d513aa4422dfe33b1991a685936084c1fda8c736fb97e25d54f1d1bf30278b6f0ce3c8a1907eeecd7bd1554076065d3824e2055265dfcbc0de2b899e1 SHA512 dae14a7eb6b09f5461c19bff83ca8ed6c21ae84d451b2c854794efb25b144b7edbf2a33479dc53e78aa646e5196e81219b4a1f393ff824db4508204a2d0301d1
+DIST mapserver-8.0.2.tar.gz 2957172 BLAKE2B fe9587afb9b805858478faa3a0a558283db6a29e0b131a605c9e2a2f20f8b8addaa8f2170997468db83164add5887bb521219a868404e88e47e907253c17c9cc SHA512 fbd0a77ba67429bd42a3450335b7a600f21e5565f620c6a1a195a0a4fb37e4091dbddc531d623765008d780ab6094da5bd3f29d3e0ec44465c6ac155ada71752

diff --git a/sci-geosciences/mapserver/mapserver-8.0.2.ebuild b/sci-geosciences/mapserver/mapserver-8.0.2.ebuild
new file mode 100644
index 000000000000..91d7c76780a7
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-8.0.2.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+JAVA_PKG_WANT_SOURCE="11"
+JAVA_PKG_WANT_TARGET="11"
+
+WEBAPP_MANUAL_SLOT=yes
+WEBAPP_OPTIONAL=yes
+
+inherit cmake depend.apache java-pkg-opt-2 perl-functions python-r1 webapp
+
+DESCRIPTION="Development environment for building spatially enabled webapps"
+HOMEPAGE="https://mapserver.org/"
+SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
+
+LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# NOTE: opengl removed for now as no support for it in upstream CMake
+IUSE="apache bidi cairo geos java mysql oracle perl postgis python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tests:
+# Included tests (tests/*) are seriously outdated
+# Upstream's main test suite (msautotest/*) is not in the release tarball,
+# and upstream sets 'export-ignore' for that directory.
+#
+# The eclasses used normally try to run test suites themselves,
+# or skip if nothing was found.
+# However, because of the python-r1 eclass usage, this fails and would
+# cause errors running non-existent tests, so we have to restrict here.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2.2.8
+	dev-libs/libxml2:2=
+	dev-libs/libxslt[crypt]
+	>=dev-libs/protobuf-c-1.3.2:=
+	>=media-libs/freetype-2.9.1-r3
+	>=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib]
+	>=media-libs/giflib-5.2.1:=
+	media-libs/libjpeg-turbo
+	>=media-libs/libpng-1.6.37:=
+	>=net-misc/curl-7.69.1
+	>=sci-libs/gdal-3.0.4:=[oracle?]
+	>=sci-libs/proj-6.2.1:=
+	virtual/libiconv
+	>=x11-libs/agg-2.5-r3
+	apache? (
+		app-admin/webapp-config
+		dev-libs/fcgi
+	)
+	bidi? (
+		dev-libs/fribidi
+		media-libs/harfbuzz:=
+	)
+	cairo? ( x11-libs/cairo )
+	geos? ( sci-libs/geos )
+	mysql? ( dev-db/mysql-connector-c:= )
+	oracle? ( dev-db/oracle-instantclient:=	)
+	perl? ( dev-lang/perl:= )
+	postgis? (
+		dev-db/postgis
+		dev-db/postgresql:=
+	)
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	java? (
+		virtual/jdk
+		>=dev-lang/swig-4.0
+	)
+	perl? ( >=dev-lang/swig-4.0 )
+	python? (
+		>=dev-lang/swig-4.0
+		>=dev-python/setuptools-44.1.0
+	)
+"
+
+want_apache2 apache
+
+pkg_setup() {
+	use apache && webapp_pkg_setup
+	use perl && perl_set_version
+
+	if use java ; then
+		QA_SONAME="usr/$(get_libdir)/libjavamapscript.so"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	use python && python_copy_sources
+}
+
+_generate_cmake_args() {
+	# Provides a simple, bare config for bindings to build upon
+	# Need WITH_WMS=ON or build fails
+	local args=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
+		"-DCMAKE_INSTALL_SYSCONFDIR=/usr/share/${PN}"
+		"-DWITH_CAIRO=OFF"
+		"-DWITH_FCGI=OFF"
+		"-DWITH_FRIBIDI=OFF"
+		"-DWITH_GEOS=OFF"
+		"-DWITH_GIF=OFF"
+		"-DWITH_HARFBUZZ=OFF"
+		"-DWITH_ICONV=OFF"
+		"-DWITH_PROTOBUFC=OFF"
+		"-DWITH_POSTGIS=OFF"
+		"-DWITH_WMS=ON"
+		"-DWITH_WCS=OFF"
+		"-DWITH_WFS=OFF"
+		"-DWITH_OGCAPI=OFF"
+	)
+
+	echo "${args[@]}"
+}
+
+src_configure() {
+	if use java; then
+		export JAVA_HOME="$(java-config -g JAVA_HOME)"
+	fi
+
+	# NOTE: We could make this based on _generate_cmake_args, but
+	# then we wouldn't be as-explicit about what is enabled/not,
+	# and reliant on defaults not changing.
+	# Readability and maintainability is better this way.
+	local mycmakeargs=(
+		"-DCMAKE_SKIP_RPATH=ON"
+		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
+		"-DCMAKE_INSTALL_SYSCONFDIR=/usr/share/${PN}"
+		"-DWITH_CLIENT_WMS=ON"
+		"-DWITH_CLIENT_WFS=ON"
+		"-DWITH_CURL=ON"
+		"-DWITH_GIF=ON"
+		"-DWITH_ICONV=ON"
+		"-DWITH_KML=ON"
+		"-DWITH_LIBXML2=ON"
+		"-DWITH_PHPNG=OFF"
+		"-DWITH_PROTOBUFC=ON"
+		"-DWITH_SOS=ON"
+		"-DWITH_WMS=ON"
+		"-DWITH_WFS=ON"
+		"-DWITH_WCS=ON"
+		"-DWITH_XMLMAPFILE=ON"
+		"-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
+		"-DWITH_CAIRO=$(usex cairo ON OFF)"
+		"-DWITH_FCGI=$(usex apache ON OFF)"
+		"-DWITH_GEOS=$(usex geos ON OFF)"
+		"-DWITH_JAVA=$(usex java ON OFF)"
+		"-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
+		"-DWITH_MYSQL=$(usex mysql ON OFF)"
+		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
+		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
+		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
+		"-DWITH_PERL=$(usex perl ON OFF)"
+	)
+
+	use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
+
+	# Configure the standard build first
+	cmake_src_configure
+
+	# Minimal build for bindings
+	# Note that we use _generate_cmake_args to get a clean config each time, then add
+	# in options as appropriate. Otherwise we'd get contamination between bindings.
+	if use python ; then
+		mycmakeargs=(
+			$(_generate_cmake_args)
+			"-DWITH_PYTHON=ON"
+		)
+
+		python_foreach_impl cmake_src_configure
+		python_foreach_impl python_optimize
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python ; then
+		python_foreach_impl cmake_src_compile
+	fi
+}
+
+src_install() {
+	# Needs to be first
+	use apache && webapp_src_preinst
+
+	if use python ; then
+		python_foreach_impl cmake_src_install
+		python_foreach_impl python_optimize
+		remove_egg_info() { rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die; }
+		python_foreach_impl remove_egg_info
+	fi
+
+	# Install this last because this build is the most "fully-featured"
+	cmake_src_install
+
+	if use apache ; then
+		# We need a mapserver symlink available in cgi-bin
+		dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv
+		webapp_src_install
+	fi
+
+	if use java ; then
+		java-pkg_dojar "${BUILD_DIR}"/mapscript/java/mapscript.jar
+	fi
+}
+
+pkg_postinst() {
+	use apache && webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	use apache && webapp_pkg_prerm
+}


             reply	other threads:[~2024-07-30 21:13 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-30 21:13 Pacho Ramos [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-30 14:41 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/mapserver/ Andreas Sturmlechner
2023-05-13  0:06 Sam James
2022-04-29  3:07 Sam James
2022-01-31 14:17 Andrew Ammerlaan
2021-10-20  4:40 Sam James
2021-10-17  0:57 Sam James
2021-03-09 22:33 Sam James
2021-01-02  6:47 Sam James
2020-07-09  0:32 Sam James
2019-05-26  8:54 Amy Liffey
2019-02-21 10:29 Andreas Sturmlechner
2018-10-14 20:00 Andreas Sturmlechner
2018-03-22  1:29 Brian Evans
2016-12-17 23:10 Sam Jorna
2016-07-13 20:30 Brian Evans
2016-03-27 12:02 Sam Jorna
2016-02-27 12:22 Amy Winston

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1722373912.0343e050e71f1abb84c923c5566914741f02b100.pacho@gentoo \
    --to=pacho@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox