mgorny      14/05/03 07:33:11

  Modified:             ChangeLog
  Added:                libSM-1.2.2-r1.ebuild
  Log:
  Depend on multilib util-linux. Do it in a revbump because util-linux is still 
masked.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  Changes    Path
1.115                x11-libs/libSM/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/ChangeLog?rev=1.115&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/ChangeLog?rev=1.115&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/ChangeLog?r1=1.114&r2=1.115

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ChangeLog   15 Apr 2014 18:36:59 -0000      1.114
+++ ChangeLog   3 May 2014 07:33:11 -0000       1.115
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libSM
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.114 2014/04/15 
18:36:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.115 2014/05/03 
07:33:11 mgorny Exp $
+
+*libSM-1.2.2-r1 (03 May 2014)
+
+  03 May 2014; Michał Górny <[email protected]> +libSM-1.2.2-r1.ebuild:
+  Depend on multilib util-linux. Do it in a revbump because util-linux is still
+  masked.
 
   15 Apr 2014; Mike Frysinger <[email protected]> libSM-1.2.1-r1.ebuild,
   libSM-1.2.1.ebuild, libSM-1.2.2.ebuild:



1.1                  x11-libs/libSM/libSM-1.2.2-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/libSM-1.2.2-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/libSM-1.2.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: libSM-1.2.2-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.2-r1.ebuild,v 1.1 
2014/05/03 07:33:11 mgorny Exp $

EAPI=5

XORG_DOC=doc
XORG_MULTILIB=yes
inherit xorg-2

DESCRIPTION="X.Org Session Management library"

KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux 
~ia64-hpux ~x86-interix ~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.5[${MULTILIB_USEDEP}]
        x11-libs/xtrans
        x11-proto/xproto[${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
}




Reply via email to