commit: d99c50d938c8b6e8ff083eb1895d80ad2829820c
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 13:14:35 2018 +0000
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 13:14:35 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d99c50d9
Revert "dev-libs/glib: bump"
This reverts commit d2a6fd4a2c7dcae1e11ebfa4a2d3a028abb2ac6d.
.../{glib-2.56.1-r1.ebuild => glib-2.56.1.ebuild} | 32 +++++++++++-----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/dev-libs/glib/glib-2.56.1-r1.ebuild
b/dev-libs/glib/glib-2.56.1.ebuild
similarity index 91%
rename from dev-libs/glib/glib-2.56.1-r1.ebuild
rename to dev-libs/glib/glib-2.56.1.ebuild
index 04ed5b91..06c64dfa 100644
--- a/dev-libs/glib/glib-2.56.1-r1.ebuild
+++ b/dev-libs/glib/glib-2.56.1.ebuild
@@ -6,26 +6,26 @@
# then to be think very closely.
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python2_7 )
# Completely useless with or without USE static-libs, people need to use
# pkg-config
GNOME2_LA_PUNT="yes"
inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool
linux-info \
- multilib multilib-minimal pax-utils python-single-r1 toolchain-funcs
versionator virtualx
+ multilib multilib-minimal pax-utils python-r1 toolchain-funcs
versionator virtualx
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="https://www.gtk.org/";
-SRC_URI="${SRC_URI}
+SRC_URI="${SRC_URI}
https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz"; #
pkg.m4 for eautoreconf
LICENSE="LGPL-2.1+"
SLOT="2"
IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test
utils xattr"
REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
+ utils? ( ${PYTHON_REQUIRED_USE} )
test? ( ${PYTHON_REQUIRED_USE} )
-" # test dep left here and elsewhere to not forget, as global python
requirement is supposed to be temporary until a split package is made with meson
+"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
@@ -44,9 +44,9 @@ RDEPEND="
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
- ${PYTHON_DEPS}
utils? (
- >=dev-util/gdbus-codegen-${PV}
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
virtual/libelf:0=
)
"
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
test? (
sys-devel/gdb
${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
>=sys-apps/dbus-1.2.14 )
!<dev-util/gtk-doc-1.15-r2
"
@@ -84,8 +84,6 @@ pkg_setup() {
fi
linux-info_pkg_setup
fi
- # FIXME: Move python deps that are only required at build time of other
packages to a split package
- python-single-r1_pkg_setup
}
src_prepare() {
@@ -122,9 +120,13 @@ src_prepare() {
# gdbus-codegen is a separate package
eapply
"${FILESDIR}"/${PN}-2.56.1-external-gdbus-codegen-for-autotools.patch
- # Leave gtester-report python shebang alone - handled by
python_fix_shebang
- sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die
-
+ # Leave python shebang alone - handled by python_replicate_script
+ # We could call python_setup and give configure a valid --with-python
+ # arg, but that would mean a build dep on python when USE=utils.
+ sed -e '/${PYTHON}/d' \
+ -i glib/Makefile.{am,in} || die
+ sed -e 's:@PYTHON@:python:' \
+ -i gobject/glib-{genmarshal.in,mkenums.in} || die
# Also needed to prevent cross-compile failures, see bug #267603
eautoreconf
@@ -179,7 +181,6 @@ multilib_src_configure() {
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
$(multilib_native_use_enable utils libelf) \
- --with-python=${EPYTHON} \
--disable-compile-warnings \
--enable-man \
--with-pcre=system \
@@ -224,9 +225,8 @@ multilib_src_install_all() {
einstalldocs
if use utils ; then
- python_fix_shebang "${ED}"/usr/bin/gtester-report
+ python_replicate_script "${ED}"/usr/bin/gtester-report
else
- # gtester-report is heavily deprecated, so do not install by
default - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4
rm "${ED}usr/bin/gtester-report"
rm "${ED}usr/share/man/man1/gtester-report.1"
fi
