Gentoo Archives: gentoo-commits

From: David Heidelberger <d.okias@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/x11:master commit in: x11-libs/libxkbcommon/
Date: Wed, 01 Jan 2014 19:59:58
Message-Id: 1388606355.7b3d5ee13ce0147f1ed3cec8d8d629572f033869.okias@gentoo
1 commit: 7b3d5ee13ce0147f1ed3cec8d8d629572f033869
2 Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
3 AuthorDate: Wed Jan 1 19:59:15 2014 +0000
4 Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
5 CommitDate: Wed Jan 1 19:59:15 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=7b3d5ee1
7
8 x11-libs/libxkbcommon: migrate to multilib, git-r3, bump 0.3.1-r1, fix git url
9
10 Package-Manager: portage-2.2.7
11
12 ---
13 ...mmon-9999.ebuild => libxkbcommon-0.3.1-r1.ebuild} | 20 ++++++++++++++------
14 x11-libs/libxkbcommon/libxkbcommon-9999.ebuild | 20 ++++++++++++++------
15 2 files changed, 28 insertions(+), 12 deletions(-)
16
17 diff --git a/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.3.1-r1.ebuild
18 similarity index 55%
19 copy from x11-libs/libxkbcommon/libxkbcommon-9999.ebuild
20 copy to x11-libs/libxkbcommon/libxkbcommon-0.3.1-r1.ebuild
21 index 6624208..b3b9704 100644
22 --- a/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild
23 +++ b/x11-libs/libxkbcommon/libxkbcommon-0.3.1-r1.ebuild
24 @@ -1,25 +1,33 @@
25 -# Copyright 1999-2013 Gentoo Foundation
26 +# Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 # $Header: $
29
30 EAPI=5
31 -XORG_DOC="doc"
32 +XORG_EAUTORECONF="yes"
33 +XORG_MULTILIB="yes"
34
35 -if [[ ${PV} = 9999* ]]; then
36 +if [[ ${PV} = *9999* ]]; then
37 + GIT_ECLASS="git-r3"
38 + EXPERIMENTAL="true"
39 EGIT_REPO_URI="git://github.com/xkbcommon/${PN}"
40 + KEYWORDS=""
41 else
42 + XORG_BASE_INDIVIDUAL_URI=""
43 SRC_URI="http://xkbcommon.org/download/${P}.tar.xz"
44 + KEYWORDS="~amd64 ~arm ~x86"
45 fi
46
47 inherit xorg-2 ${GIT_ECLASS}
48
49 DESCRIPTION="X.Org xkbcommon library"
50 -KEYWORDS="~amd64 ~arm ~x86"
51 +
52 +IUSE="doc"
53
54 DEPEND="sys-devel/bison
55 sys-devel/flex
56 - x11-proto/xproto
57 - >=x11-proto/kbproto-1.0.5"
58 + x11-proto/xproto[${MULTILIB_USEDEP}]
59 + >=x11-proto/kbproto-1.0.5[${MULTILIB_USEDEP}]
60 + doc? ( app-doc/doxygen )"
61 RDEPEND=""
62
63 XORG_CONFIGURE_OPTIONS=(
64
65 diff --git a/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild b/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild
66 index 6624208..b3b9704 100644
67 --- a/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild
68 +++ b/x11-libs/libxkbcommon/libxkbcommon-9999.ebuild
69 @@ -1,25 +1,33 @@
70 -# Copyright 1999-2013 Gentoo Foundation
71 +# Copyright 1999-2014 Gentoo Foundation
72 # Distributed under the terms of the GNU General Public License v2
73 # $Header: $
74
75 EAPI=5
76 -XORG_DOC="doc"
77 +XORG_EAUTORECONF="yes"
78 +XORG_MULTILIB="yes"
79
80 -if [[ ${PV} = 9999* ]]; then
81 +if [[ ${PV} = *9999* ]]; then
82 + GIT_ECLASS="git-r3"
83 + EXPERIMENTAL="true"
84 EGIT_REPO_URI="git://github.com/xkbcommon/${PN}"
85 + KEYWORDS=""
86 else
87 + XORG_BASE_INDIVIDUAL_URI=""
88 SRC_URI="http://xkbcommon.org/download/${P}.tar.xz"
89 + KEYWORDS="~amd64 ~arm ~x86"
90 fi
91
92 inherit xorg-2 ${GIT_ECLASS}
93
94 DESCRIPTION="X.Org xkbcommon library"
95 -KEYWORDS="~amd64 ~arm ~x86"
96 +
97 +IUSE="doc"
98
99 DEPEND="sys-devel/bison
100 sys-devel/flex
101 - x11-proto/xproto
102 - >=x11-proto/kbproto-1.0.5"
103 + x11-proto/xproto[${MULTILIB_USEDEP}]
104 + >=x11-proto/kbproto-1.0.5[${MULTILIB_USEDEP}]
105 + doc? ( app-doc/doxygen )"
106 RDEPEND=""
107
108 XORG_CONFIGURE_OPTIONS=(