From 6057c95e193bd173984f44b6b3881d832350d2a6 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 21 May 2018 22:18:30 +0200 Subject: x11-libs/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto). --- x11-libs/libSM/libSM-1.2.2-r1.ebuild | 57 ------------------------------------ x11-libs/libSM/libSM-1.2.2-r2.ebuild | 57 ++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 x11-libs/libSM/libSM-1.2.2-r1.ebuild create mode 100644 x11-libs/libSM/libSM-1.2.2-r2.ebuild (limited to 'x11-libs/libSM') diff --git a/x11-libs/libSM/libSM-1.2.2-r1.ebuild b/x11-libs/libSM/libSM-1.2.2-r1.ebuild deleted file mode 100644 index 303ae7650ca2..000000000000 --- a/x11-libs/libSM/libSM-1.2.2-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -XORG_DOC=doc -XORG_MULTILIB=yes -inherit xorg-2 - -DESCRIPTION="X.Org Session Management library" - -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="doc ipv6 +uuid" - -RDEPEND=">=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] - x11-libs/xtrans - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( - uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] ) - ) ) )" -DEPEND="${RDEPEND}" - -src_configure() { - local withuuid=$(use_with uuid libuuid) - - # do not use uuid even if available in libc (like on FreeBSD) - use uuid || export ac_cv_func_uuid_create=no - - if use uuid ; then - case ${CHOST} in - *-solaris*|*-darwin*) - if [[ ! -d ${EROOT}usr/include/uuid ]] && - [[ -d ${ROOT}usr/include/uuid ]] - then - # Solaris and Darwin have uuid provided by the host - # system. Since util-linux's version is based on this - # version, and on Darwin actually breaks host headers when - # installed, we can "pretend" for libSM we have libuuid - # installed, while in fact we don't - withuuid="--without-libuuid" - export HAVE_LIBUUID=yes - export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid" - # Darwin has uuid in libSystem - [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid" - fi - ;; - esac - fi - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable doc docs) - $(use_with doc xmlto) - ${withuuid} - --without-fop - ) - xorg-2_src_configure -} diff --git a/x11-libs/libSM/libSM-1.2.2-r2.ebuild b/x11-libs/libSM/libSM-1.2.2-r2.ebuild new file mode 100644 index 000000000000..bd0fd69552dd --- /dev/null +++ b/x11-libs/libSM/libSM-1.2.2-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +XORG_DOC=doc +XORG_MULTILIB=yes +inherit xorg-2 + +DESCRIPTION="X.Org Session Management library" + +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="doc ipv6 +uuid" + +RDEPEND="x11-base/xorg-proto + >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] + x11-libs/xtrans + !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( + uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] ) + ) ) )" +DEPEND="${RDEPEND}" + +src_configure() { + local withuuid=$(use_with uuid libuuid) + + # do not use uuid even if available in libc (like on FreeBSD) + use uuid || export ac_cv_func_uuid_create=no + + if use uuid ; then + case ${CHOST} in + *-solaris*|*-darwin*) + if [[ ! -d ${EROOT}usr/include/uuid ]] && + [[ -d ${ROOT}usr/include/uuid ]] + then + # Solaris and Darwin have uuid provided by the host + # system. Since util-linux's version is based on this + # version, and on Darwin actually breaks host headers when + # installed, we can "pretend" for libSM we have libuuid + # installed, while in fact we don't + withuuid="--without-libuuid" + export HAVE_LIBUUID=yes + export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid" + # Darwin has uuid in libSystem + [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid" + fi + ;; + esac + fi + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable doc docs) + $(use_with doc xmlto) + ${withuuid} + --without-fop + ) + xorg-2_src_configure +} -- cgit v1.2.3-65-gdbad