python-dbus: include egg-info metadata
Also drop python-dbus-devel, there is no value in carrying the metapkg.
This commit is contained in:
parent
a0442790ec
commit
5f628d6fc8
|
@ -1 +0,0 @@
|
||||||
python-dbus
|
|
|
@ -1,11 +1,11 @@
|
||||||
# Template file for 'python-dbus'
|
# Template file for 'python-dbus'
|
||||||
pkgname=python-dbus
|
pkgname=python-dbus
|
||||||
version=1.2.18
|
version=1.2.18
|
||||||
revision=1
|
revision=2
|
||||||
wrksrc="dbus-python-${version}"
|
wrksrc="dbus-python-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
hostmakedepends="pkg-config python-devel python3-devel"
|
hostmakedepends="pkg-config python python3"
|
||||||
makedepends="libglib-devel ${hostmakedepends/pkg-config/}"
|
makedepends="libglib-devel python3-devel python-devel"
|
||||||
depends="python dbus"
|
depends="python dbus"
|
||||||
short_desc="D-Bus Python2 bindings"
|
short_desc="D-Bus Python2 bindings"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
|
@ -20,35 +20,55 @@ pre_configure() {
|
||||||
mv * dbus-${py2_ver} || true
|
mv * dbus-${py2_ver} || true
|
||||||
cp -a dbus-${py2_ver} dbus-${py3_ver}
|
cp -a dbus-${py2_ver} dbus-${py3_ver}
|
||||||
}
|
}
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
local py_abiver=
|
local py_abiver py_inc pyver
|
||||||
for pyver in $py2_ver $py3_ver; do
|
for pyver in $py2_ver $py3_ver; do
|
||||||
if [ "$pyver" != "$py2_ver" ]; then
|
case "${pyver}" in
|
||||||
|
"${py2_ver}")
|
||||||
|
py_inc="$py2_inc"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
py_inc="$py3_inc"
|
py_inc="$py3_inc"
|
||||||
py_abiver="$py3_abiver"
|
py_abiver="$py3_abiver"
|
||||||
else
|
;;
|
||||||
py_inc="$py2_inc"
|
esac
|
||||||
fi
|
|
||||||
|
|
||||||
cd ${wrksrc}/dbus-${pyver}
|
|
||||||
export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py_inc}"
|
export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py_inc}"
|
||||||
export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${py_abiver}"
|
export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${py_abiver}"
|
||||||
export PYTHON_VERSION="${pyver}"
|
export PYTHON_VERSION="${pyver}"
|
||||||
./configure ${configure_args}
|
|
||||||
|
( cd dbus-${pyver} && ./configure ${configure_args} )
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
unset PYTHON_CPPFLAGS PYTHON_EXTRA_LIBS PYTHON_VERSION
|
||||||
}
|
}
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
|
local pyver
|
||||||
for pyver in $py2_ver $py3_ver; do
|
for pyver in $py2_ver $py3_ver; do
|
||||||
cd ${wrksrc}/dbus-${pyver}
|
( cd dbus-${pyver} && make ${makejobs} )
|
||||||
make ${makejobs}
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
|
local pyver pysite eggver
|
||||||
for pyver in $py2_ver $py3_ver; do
|
for pyver in $py2_ver $py3_ver; do
|
||||||
cd ${wrksrc}/dbus-${pyver}
|
case "${pyver}" in
|
||||||
|
"${py2_ver}") pysite="${py2_sitelib}" ;;
|
||||||
|
*) pysite="${py3_sitelib}" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
eggver="dbus_python-${version}-py${pyver}"
|
||||||
|
(
|
||||||
|
cd dbus-${pyver}
|
||||||
make DESTDIR=${DESTDIR} install
|
make DESTDIR=${DESTDIR} install
|
||||||
vlicense COPYING
|
vcopy dbus_python.egg-info "${pysite}/${eggver}.egg-info"
|
||||||
|
)
|
||||||
done
|
done
|
||||||
|
|
||||||
|
vlicense dbus-${py2_ver}/COPYING
|
||||||
}
|
}
|
||||||
|
|
||||||
python3-dbus_package() {
|
python3-dbus_package() {
|
||||||
|
@ -57,16 +77,10 @@ python3-dbus_package() {
|
||||||
short_desc="${short_desc/Python2/Python3}"
|
short_desc="${short_desc/Python2/Python3}"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/lib/python3*
|
vmove usr/lib/python3*
|
||||||
|
vlicense dbus-${py3_ver}/COPYING
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
# This package used to provide both Python 2 and Python 3 development files
|
|
||||||
# Those files are now in python3-dbus-devel
|
|
||||||
python-dbus-devel_package() {
|
|
||||||
depends="python-devel python-dbus>=${version}_${revision}
|
|
||||||
python3-dbus-devel>=${version}_${revision}"
|
|
||||||
build_style=meta
|
|
||||||
short_desc+=" - development files (Python 2 meta)"
|
|
||||||
}
|
|
||||||
python3-dbus-devel_package() {
|
python3-dbus-devel_package() {
|
||||||
depends="python3-devel python3-dbus>=${version}_${revision}"
|
depends="python3-devel python3-dbus>=${version}_${revision}"
|
||||||
short_desc="${short_desc/Python2/Python3} - development files"
|
short_desc="${short_desc/Python2/Python3} - development files"
|
||||||
|
|
Loading…
Reference in a new issue