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