Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/libSM: libSM-1.2.2-r1.ebuild ChangeLog
Date: Sat, 03 May 2014 07:33:14
Message-Id: 20140503073311.5CE922004C@flycatcher.gentoo.org
1 mgorny 14/05/03 07:33:11
2
3 Modified: ChangeLog
4 Added: libSM-1.2.2-r1.ebuild
5 Log:
6 Depend on multilib util-linux. Do it in a revbump because util-linux is still masked.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
9
10 Revision Changes Path
11 1.115 x11-libs/libSM/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/ChangeLog?rev=1.115&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/ChangeLog?rev=1.115&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/ChangeLog?r1=1.114&r2=1.115
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v
20 retrieving revision 1.114
21 retrieving revision 1.115
22 diff -u -r1.114 -r1.115
23 --- ChangeLog 15 Apr 2014 18:36:59 -0000 1.114
24 +++ ChangeLog 3 May 2014 07:33:11 -0000 1.115
25 @@ -1,6 +1,12 @@
26 # ChangeLog for x11-libs/libSM
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.114 2014/04/15 18:36:59 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.115 2014/05/03 07:33:11 mgorny Exp $
30 +
31 +*libSM-1.2.2-r1 (03 May 2014)
32 +
33 + 03 May 2014; Michał Górny <mgorny@g.o> +libSM-1.2.2-r1.ebuild:
34 + Depend on multilib util-linux. Do it in a revbump because util-linux is still
35 + masked.
36
37 15 Apr 2014; Mike Frysinger <vapier@g.o> libSM-1.2.1-r1.ebuild,
38 libSM-1.2.1.ebuild, libSM-1.2.2.ebuild:
39
40
41
42 1.1 x11-libs/libSM/libSM-1.2.2-r1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libSM/libSM-1.2.2-r1.ebuild?rev=1.1&view=markup
45 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
46
47 Index: libSM-1.2.2-r1.ebuild
48 ===================================================================
49 # Copyright 1999-2014 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $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 $
52
53 EAPI=5
54
55 XORG_DOC=doc
56 XORG_MULTILIB=yes
57 inherit xorg-2
58
59 DESCRIPTION="X.Org Session Management library"
60
61 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"
62 IUSE="doc ipv6 +uuid"
63
64 RDEPEND=">=x11-libs/libICE-1.0.5[${MULTILIB_USEDEP}]
65 x11-libs/xtrans
66 x11-proto/xproto[${MULTILIB_USEDEP}]
67 !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
68 uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
69 ) ) )"
70 DEPEND="${RDEPEND}"
71
72 src_configure() {
73 local withuuid=$(use_with uuid libuuid)
74
75 # do not use uuid even if available in libc (like on FreeBSD)
76 use uuid || export ac_cv_func_uuid_create=no
77
78 if use uuid ; then
79 case ${CHOST} in
80 *-solaris*|*-darwin*)
81 if [[ ! -d ${EROOT}usr/include/uuid ]] &&
82 [[ -d ${ROOT}usr/include/uuid ]]
83 then
84 # Solaris and Darwin have uuid provided by the host
85 # system. Since util-linux's version is based on this
86 # version, and on Darwin actually breaks host headers when
87 # installed, we can "pretend" for libSM we have libuuid
88 # installed, while in fact we don't
89 withuuid="--without-libuuid"
90 export HAVE_LIBUUID=yes
91 export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
92 # Darwin has uuid in libSystem
93 [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid"
94 fi
95 ;;
96 esac
97 fi
98 XORG_CONFIGURE_OPTIONS=(
99 $(use_enable ipv6)
100 $(use_enable doc docs)
101 $(use_with doc xmlto)
102 ${withuuid}
103 --without-fop
104 )
105 xorg-2_src_configure
106 }