summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-radio/xastir/xastir-9999.ebuild31
1 files changed, 7 insertions, 24 deletions
diff --git a/media-radio/xastir/xastir-9999.ebuild b/media-radio/xastir/xastir-9999.ebuild
index aed6672..0d1d19e 100644
--- a/media-radio/xastir/xastir-9999.ebuild
+++ b/media-radio/xastir/xastir-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
POSTGRES_COMPAT=( 11 10 9.6 9.5 )
-inherit autotools flag-o-matic postgres-multi toolchain-funcs
+inherit autotools flag-o-matic postgres toolchain-funcs
DESCRIPTION="X Amateur Station Tracking and Information Reporting"
HOMEPAGE="http://xastir.org/"
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="ax25 debug festival gdal geotiff gpsman graphicsmagick mysql postgres spatialdb"
REQUIRED_USE="spatialdb? ( ^^ ( postgres mysql ) )
- postgres? ( ${POSTGRES_REQ_USE/||/^^} )"
+ postgres? ( ${POSTGRES_REQ_USE} )"
DEPEND=">=x11-libs/motif-2.3:0
x11-libs/libXt
@@ -53,7 +53,7 @@ DEPEND=">=x11-libs/motif-2.3:0
RDEPEND="${DEPEND}"
pkg_setup() {
- postgres-multi_pkg_setup
+ postgres_pkg_setup
}
src_prepare() {
@@ -85,8 +85,7 @@ src_configure() {
# provide include path to GraphicsMagic for configure stage
use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
- myeconf() {
- econf \
+ econf \
--with-pcre \
--with-shapelib \
--with-dbfawk \
@@ -107,34 +106,18 @@ src_configure() {
$(use_with geotiff) \
$(use_with gdal) \
$(use_with festival)
- }
-
- if use postgres; then
- local MULTIBUILD_VARIANT="${_POSTGRES_INTERSECT_SLOTS[0]}"
- _postgres-multi_multibuild_wrapper myeconf
- else
- myeconf
- fi
}
src_compile() {
- if use postgres; then
- local MULTIBUILD_VARIANT="${_POSTGRES_INTERSECT_SLOTS[0]}"
- _postgres-multi_multibuild_wrapper emake AR="$(tc-getAR)"
- else
- emake AR="$(tc-getAR)"
- fi
+ emake AR="$(tc-getAR)"
}
src_install() {
- if use postgres; then
- local MULTIBUILD_VARIANT="${_POSTGRES_INTERSECT_SLOTS[0]}"
- _postgres-multi_multibuild_wrapper emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install
+ if use postgres; then
insinto /usr/share/xastir/scripts
doins scripts/db_gis_postgis.sql
- else
- emake DESTDIR="${D}" install
fi
rm -rf "${D}"/usr/share/doc/${PN}