summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSobhan Mohammadpour <sobhan@gentoo.org>2018-02-16 19:20:02 +0330
committerSobhan Mohammadpour <sobhan@gentoo.org>2018-02-16 19:20:02 +0330
commit9782b57b5f5363960784efad0afb0b2927a76870 (patch)
treeb627f5fa41bbe65e6be64551d383fc826589830e
parentwww-client/epiphany: bump (diff)
downloadgnome-9782b57b5f5363960784efad0afb0b2927a76870.tar.gz
gnome-9782b57b5f5363960784efad0afb0b2927a76870.tar.bz2
gnome-9782b57b5f5363960784efad0afb0b2927a76870.zip
dev-libs/glib: remove not working ebuild
Package-Manager: Portage-2.3.24, Repoman-2.3.6 Manifest-Sign-Key: 0x7DF238CF0AA182E1
-rw-r--r--dev-libs/glib/Manifest27
-rw-r--r--dev-libs/glib/glib-2.54.2.ebuild304
-rw-r--r--dev-libs/glib/glib-2.54.3-r1.ebuild2
3 files changed, 14 insertions, 319 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 4000d48f..92f459d0 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,25 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-DIST glib-2.54.2.tar.xz 7830724 BLAKE2B d3098bf8be0427b2e65b9ea6b2e9dd161b611fe3582517f3e693907362bb8207ce622057530e9417f184d82d1e335f4272940c92ca59719667dc1a162f66d4d6 SHA512 09ee6fa3a6f3f15af229bd789bef536e3570f36d1e4ce624a57e97c4040577f6baccd6ab5746257863ccf7173b558cfa753951d562a278f854e52604104ba7ee
DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKTBAEBCAB9FiEEhjiDzgE0H6m8d3Z/4FucaN0bWf0FAlpwRYJfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEhjiDzgE0H6m8d3Z/4FucaN0bWf0FAlqG/apfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDg2
Mzg4M0NFMDEzNDFGQTlCQzc3NzY3RkUwNUI5QzY4REQxQjU5RkQACgkQ4FucaN0b
-Wf1M3Q/+OxHnSjm4/tDseFRTKnWUXLm3d/1bS9YWv17If1+Q91GdH0jJUXUezTJN
-1oRVtR1g7AsJeSCN/01oDP6PjVRXS918S1SN8qS4VeWeL0ywxcHXtv+e0PpcIgf6
-D5MJTxgdM6jlbZ3t4MacHybq7FiMg74OAJe1n4s8NLdDxkOFbpveCr60QWPem6v3
-pdHni07f7cDaps9DsBMyU0MSFh1HcQCenIm/I5mTLZTJWECVd1+RNcrbI1fIBM0V
-Ntj/yv8eTOri/8jkPEAYr2ElwxT7+PpVlV1k0ojvvqtcEAV3AX97QuZTiObSsfHl
-xuIgr/WMtBktLwVA5VoTuHVDmsbKFvZH4z8hdU+l3WGNzFbp4W4orwSGpsIxGjTb
-d7fxXI+RdvHd8N7985HDeerGD/3cOyPUtSfeJpdVZRadK+k9SnBCJBId+WZcj7Rc
-T7z+NbnK0IrxKv+6PlLLdsUOC043P4yhzYjgyswJSaWBaH5beM3mwU8kvaVMQzqK
-rfFuI+8RF/HPG/mjUgc4SvWsGB1M4TGqku7rPV+fJovyezMUYUwSpcMEB8nGWaC1
-ybI4pObKJd2f7utcgagcdL8S6wqT+Pwhox/zhXcr7EhVF2o97QxCvvl82S+zZpuS
-2VMOYmq+DKzn9v8vAwAjsNT9d87LRgCDaZLX4aJJdBxgSgtYatY=
-=5bPS
+Wf3wAg//TclSHpgKRCueAgAchJqLmdyp28nu0k4PRUZlqXK90oPicmSK2t+EHR7a
+m8iNL7ptN/FAQ2YZ1zAjo0tsGgxCaft7X0j5NtGgkzBiYierAhOfhDsQWrjgJ7Ec
+wzF152DfpoytQorZQzjfg+gaeXOhuUHuopj9ekZvQphJS5HoHheWCaS+AUUkaLSP
+XPGQtq9lRs/zf/09JvL/c2uTtQPbO3fDdfu/lNYKTsLvSDe4nOGvQnXKjOOTpha8
+Kcnq806Q/xNCLPaQjMOiCOxVP52hDn/XocBIDvQEGO/83dV05SO0SzLpE8GY/yj/
+Zj+MU/XjaoU1OmxDkhRbYpD/Vd+eZnDqx6OHJ22H/cTlpwIYw3a2TJ+Zt9qA85KJ
+W3Ro3dLpoCohYK8ls3WwlSD6IScsv0K/ogsdO22fj64FXWxkrCS+RXjSCzpkWM5t
+wAleoRUSEbzLmQAPW18XZ9PO6l5H8PZhrr1pCGgE2QgsgX8l9kG3tSP+c0nEuabg
+pJ47+LrG9iAHVV17Rwa/UvEvh4cW2l/52UbLnPueB3LvfyENudOuCg72WTE6jPE8
+UgyuI5PkFqwWJP4S+kuVLGY3W+damC6uRvYCi9wDAeH0CqJniSooRQ4MSkTQs0Ub
+WZNqWTT4IjSGeDBrUgZY7PeEEoVuoqvHUW5PgfVHYMReMCf9ToU=
+=c72j
-----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.54.2.ebuild b/dev-libs/glib/glib-2.54.2.ebuild
deleted file mode 100644
index 257cbe2c..00000000
--- a/dev-libs/glib/glib-2.54.2.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit bash-completion-r1 epunt-cxx flag-o-matic gnome-meson libtool linux-info \
- 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}
- 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="
- utils? ( ${PYTHON_REQUIRED_USE} )
- test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-# Added util-linux multilib dependency to have libmount support (which
-# is always turned on on linux systems, unless explicitly disabled, but
-# this ebuild does not do that anyway) (bug #599586)
-
-RDEPEND="
- !<dev-util/gdbus-codegen-${PV}
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
- 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}] )
- utils? (
- ${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
- virtual/libelf:0=
- )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=dev-libs/libxslt-1.0
- >=sys-devel/gettext-0.11
- >=dev-util/gtk-doc-am-1.20
- systemtap? ( >=dev-util/systemtap-1.3 )
- test? (
- sys-devel/gdb
- ${PYTHON_DEPS}
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
- >=sys-apps/dbus-1.2.14 )
- !<dev-util/gtk-doc-1.15-r2
-"
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
- dbus? ( gnome-base/dconf )
- mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-# Earlier versions of gvfs do not work with glib
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
- if use kernel_linux ; then
- CONFIG_CHECK="~INOTIFY_USER"
- if use test ; then
- CONFIG_CHECK="~IPV6"
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
- fi
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
- # Copy missing gengiotypefuncs.py
- cp "${FILESDIR}"/gengiotypefuncs.py "${S}"/gio/tests/ || die
-
- # We need gengiotypefuncs
- if use test; then
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
- if ! has_version dev-util/desktop-file-utils ; then
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
- ewarn "think on installing it to get these tests run."
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
- fi
-
- # gdesktopappinfo requires existing terminal (gnome-terminal or any
- # other), falling back to xterm if one doesn't exist
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
- ewarn "Some tests will be skipped due to missing terminal program"
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
- fi
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
- ewarn "Tests for search-utils have been skipped"
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
- else
- # Don't build tests, also prevents extra deps, bug #512022
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
- fi
-
- # gdbus-codegen is a separate package
- eapply "${FILESDIR}"/${PN}-2.54.2-external-codegen.patch
-
- # 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
-
- gnome-meson_src_prepare
-
- epunt_cxx
-}
-
-multilib_src_configure() {
- # TODO is this still relevent?
- # Avoid circular depend with dev-util/pkgconfig and
- # native builds (cross-compiles won't need pkg-config
- # in the target ROOT to work here)
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
- if has_version sys-apps/dbus; then
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
- export DBUS1_LIBS="-ldbus-1"
- fi
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
- export LIBFFI_LIBS="-lffi"
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
- export PCRE_LIBS="-lpcre"
- fi
-
- # These configure tests don't work when cross-compiling.
- if tc-is-cross-compiler ; then
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473
- case ${CHOST} in
- hppa*|metag*) export glib_cv_stack_grows=yes ;;
- *) export glib_cv_stack_grows=no ;;
- esac
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474
- export glib_cv_uscore=no
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes
- fi
-
- local myconf
-
- # FIXME multilib automagic for libelf
- # FIXME set systemtap/tapse/static-lib install dir and test it.
- # FIXME no selinux, fam, xattr for now.
- # FIXME is this still valid.
- # libelf used only by the gresource bin ??
- # FIXME enable docs if possible.
-
- use static-libs && myconf="-Ddefault_library='static'"
- use debug && myconf="$myconf -Dbuildtype='debug'"
-
- gnome-meson_src_configure \
- ${myconf} \
- -Denable-libmount=$(usex kernel_linux yes no) \
- $(gnome-meson_use systemtap dtrace) \
- $(gnome-meson_use systemtap) \
- -Dwith-pcre=system \
- -Dwith-docs=no \
- -Dwith-man=yes
-
- if multilib_is_native_abi; then
- local d
- for d in glib gio gobject; do
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
- done
- fi
-}
-
-multilib_src_compile() {
- gnome-meson_src_compile
-}
-# FIXME
-multilib_src_test() {
- export XDG_CONFIG_DIRS=/etc/xdg
- export XDG_DATA_DIRS=/usr/local/share:/usr/share
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
- export LC_TIME=C # bug #411967
- unset GSETTINGS_BACKEND # bug #596380
- python_setup
-
- # Related test is a bit nitpicking
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
- # Hardened: gdb needs this, bug #338891
- if host-is-pax ; then
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
- || die "Hardened adjustment failed"
- fi
-
- # Need X for dbus-launch session X11 initialization
- virtx meson_src_test
-}
-
-# FIXME completentiondir
-multilib_src_install() {
- gnome-meson_src_install completiondir="$(get_bashcompdir)"
- keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use utils ; then
- python_replicate_script "${ED}"/usr/bin/gtester-report
- else
- rm "${ED}usr/bin/gtester-report"
- rm "${ED}usr/share/man/man1/gtester-report.1"
- fi
-
- # Do not install charset.alias even if generated, leave it to libiconv
- rm -f "${ED}/usr/lib/charset.alias"
-
- # Don't install gdb python macros, bug 291328
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-}
-
-pkg_preinst() {
- gnome-meson_pkg_preinst
-
- # Make gschemas.compiled belong to glib alone
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
-
- multilib_pkg_preinst() {
- # Make giomodule.cache belong to glib alone
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
-
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
- # file due to inability to create it and GIO might not look at any of the modules there
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_preinst
- fi
-}
-
-pkg_postinst() {
- # force (re)generation of gschemas.compiled
- gnome-meson_GNOME2_ECLASS_GLIB_SCHEMAS="force"
-
- gnome-meson_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- if ! tc-is-cross-compiler ; then
- multilib_foreach_abi multilib_pkg_postinst
- else
- ewarn "Updating of GIO modules cache skipped due to cross-compilation."
- ewarn "You might want to run gio-querymodules manually on the target for"
- ewarn "your final image for performance reasons and re-run it when packages"
- ewarn "installing GIO modules get upgraded or added to the image."
- fi
-}
-
-pkg_postrm() {
- gnome-meson_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
- }
- multilib_foreach_abi multilib_pkg_postrm
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
- fi
-}
diff --git a/dev-libs/glib/glib-2.54.3-r1.ebuild b/dev-libs/glib/glib-2.54.3-r1.ebuild
index cfa92591..3f54b53e 100644
--- a/dev-libs/glib/glib-2.54.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.54.3-r1.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
test? ( ${PYTHON_REQUIRED_USE} )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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"
# Added util-linux multilib dependency to have libmount support (which
# is always turned on on linux systems, unless explicitly disabled, but