Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/gobject-introspection/
Date: Sat, 11 Jan 2020 19:24:29
Message-Id: 1578770586.02e5c8f9dd25d837144e4fb8cbdc4cf9b2d9c621.leio@gentoo
1 commit: 02e5c8f9dd25d837144e4fb8cbdc4cf9b2d9c621
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 11 19:23:06 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 11 19:23:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e5c8f9
7
8 dev-libs/gobject-introspection: remove old
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 dev-libs/gobject-introspection/Manifest | 2 -
14 .../gobject-introspection-1.56.1.ebuild | 72 ---------------------
15 .../gobject-introspection-1.58.3.ebuild | 73 ----------------------
16 3 files changed, 147 deletions(-)
17
18 diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
19 index fcc6eaf07cb..0cc4d4adb46 100644
20 --- a/dev-libs/gobject-introspection/Manifest
21 +++ b/dev-libs/gobject-introspection/Manifest
22 @@ -1,3 +1 @@
23 -DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
24 -DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f6d343312d4967345cc202ef137f29690fbd7a35fa9310f87b134fbdfd4fd753b68b47203cd306689d9892eccf17e303d1e7bcccd4 SHA512 0811cd08e224975b3aa55ae89d648fc65f3105cae8a077a5671593d84743b1db28e9fbffe53fc86a2b3e82ea98c35f3daae033d3df07c7020cc3bf8b5d94f796
25 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
26
27 diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
28 deleted file mode 100644
29 index f8d83318607..00000000000
30 --- a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
31 +++ /dev/null
32 @@ -1,72 +0,0 @@
33 -# Copyright 1999-2020 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -PYTHON_COMPAT=( python{2_7,3_6,3_7} )
38 -PYTHON_REQ_USE="xml"
39 -
40 -inherit gnome2 python-single-r1 toolchain-funcs
41 -
42 -DESCRIPTION="Introspection system for GObject-based libraries"
43 -HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
44 -
45 -LICENSE="LGPL-2+ GPL-2+"
46 -SLOT="0"
47 -IUSE="cairo doctool test"
48 -RESTRICT="!test? ( test )"
49 -REQUIRED_USE="
50 - ${PYTHON_REQUIRED_USE}
51 - test? ( cairo )
52 -"
53 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
54 -
55 -# virtual/pkgconfig needed at runtime, bug #505408
56 -# We force glib and g-i to be in sync by this way as explained in bug #518424
57 -RDEPEND="
58 - >=dev-libs/gobject-introspection-common-${PV}
59 - >=dev-libs/glib-2.56.1:2
60 - doctool? ( dev-python/mako[${PYTHON_USEDEP}] )
61 - virtual/libffi:=
62 - virtual/pkgconfig
63 - !<dev-lang/vala-0.20.0
64 - ${PYTHON_DEPS}
65 -"
66 -# Wants real bison, not virtual/yacc
67 -DEPEND="${RDEPEND}
68 - >=dev-util/gtk-doc-am-1.19
69 - sys-devel/bison
70 - sys-devel/flex
71 - test? ( x11-libs/cairo[glib] )
72 -"
73 -# PDEPEND to avoid circular dependencies, bug #391213; but needed for tests, thus test DEPEND as well
74 -PDEPEND="cairo? ( x11-libs/cairo[glib] )"
75 -
76 -pkg_setup() {
77 - python-single-r1_pkg_setup
78 -}
79 -
80 -src_configure() {
81 - if ! has_version "x11-libs/cairo[glib]"; then
82 - # Bug #391213: enable cairo-gobject support even if it's not installed
83 - # We only PDEPEND on cairo to avoid circular dependencies
84 - export CAIRO_LIBS="-lcairo -lcairo-gobject"
85 - export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
86 - fi
87 -
88 - # To prevent crosscompiling problems, bug #414105
89 - gnome2_src_configure \
90 - --disable-static \
91 - CC="$(tc-getCC)" \
92 - YACC="$(type -p yacc)" \
93 - $(use_with cairo) \
94 - $(use_enable doctool)
95 -}
96 -
97 -src_install() {
98 - gnome2_src_install
99 -
100 - # Prevent collision with gobject-introspection-common
101 - rm -v "${ED}"usr/share/aclocal/introspection.m4 \
102 - "${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
103 - rmdir "${ED}"usr/share/aclocal || die
104 -}
105
106 diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
107 deleted file mode 100644
108 index 7481a437077..00000000000
109 --- a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
110 +++ /dev/null
111 @@ -1,73 +0,0 @@
112 -# Copyright 1999-2020 Gentoo Authors
113 -# Distributed under the terms of the GNU General Public License v2
114 -
115 -EAPI=6
116 -PYTHON_COMPAT=( python{2_7,3_6,3_7} )
117 -PYTHON_REQ_USE="xml"
118 -
119 -inherit gnome2 python-single-r1 toolchain-funcs
120 -
121 -DESCRIPTION="Introspection system for GObject-based libraries"
122 -HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
123 -
124 -LICENSE="LGPL-2+ GPL-2+"
125 -SLOT="0"
126 -IUSE="cairo doctool test"
127 -RESTRICT="!test? ( test )"
128 -REQUIRED_USE="
129 - ${PYTHON_REQUIRED_USE}
130 - test? ( cairo )
131 -"
132 -KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
133 -
134 -# virtual/pkgconfig needed at runtime, bug #505408
135 -# We force glib and g-i to be in sync by this way as explained in bug #518424
136 -RDEPEND="
137 - >=dev-libs/gobject-introspection-common-${PV}
138 - >=dev-libs/glib-2.58.0:2
139 - doctool? ( dev-python/mako[${PYTHON_USEDEP}]
140 - dev-python/markdown[${PYTHON_USEDEP}] )
141 - virtual/libffi:=
142 - virtual/pkgconfig
143 - !<dev-lang/vala-0.20.0
144 - ${PYTHON_DEPS}
145 -"
146 -# Wants real bison, not virtual/yacc
147 -DEPEND="${RDEPEND}
148 - >=dev-util/gtk-doc-am-1.19
149 - sys-devel/bison
150 - sys-devel/flex
151 - test? ( x11-libs/cairo[glib] )
152 -" # autoreconf needs autoconf-archive
153 -# PDEPEND to avoid circular dependencies, bug #391213; but needed for tests, thus test DEPEND as well
154 -PDEPEND="cairo? ( x11-libs/cairo[glib] )"
155 -
156 -pkg_setup() {
157 - python-single-r1_pkg_setup
158 -}
159 -
160 -src_configure() {
161 - if ! has_version "x11-libs/cairo[glib]"; then
162 - # Bug #391213: enable cairo-gobject support even if it's not installed
163 - # We only PDEPEND on cairo to avoid circular dependencies
164 - export CAIRO_LIBS="-lcairo -lcairo-gobject"
165 - export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
166 - fi
167 -
168 - # To prevent crosscompiling problems, bug #414105
169 - gnome2_src_configure \
170 - --disable-static \
171 - CC="$(tc-getCC)" \
172 - YACC="$(type -p yacc)" \
173 - $(use_with cairo) \
174 - $(use_enable doctool)
175 -}
176 -
177 -src_install() {
178 - gnome2_src_install
179 -
180 - # Prevent collision with gobject-introspection-common
181 - rm -v "${ED}"usr/share/aclocal/introspection.m4 \
182 - "${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
183 - rmdir "${ED}"usr/share/aclocal || die
184 -}