Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/libpeas/, dev-libs/libpeas/files/
Date: Fri, 14 Sep 2018 08:54:54
Message-Id: 1536915159.13c8b1021b1d83c3dcf06779103d91136b6c7877.leio@gentoo
1 commit: 13c8b1021b1d83c3dcf06779103d91136b6c7877
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 14 08:52:39 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 14 08:52:39 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=13c8b102
7
8 dev-libs/libpeas: remove, available in ::gentoo
9
10 Also remove 9999 as it's hopelessly out of date
11
12 dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch | 18 ----
13 dev-libs/libpeas/libpeas-1.22.0.ebuild | 84 -------------------
14 dev-libs/libpeas/libpeas-9999.ebuild | 96 ----------------------
15 dev-libs/libpeas/metadata.xml | 13 ---
16 4 files changed, 211 deletions(-)
17
18 diff --git a/dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch b/dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch
19 deleted file mode 100644
20 index c46cbee2..00000000
21 --- a/dev-libs/libpeas/files/libpeas-1.14.0-lua.pc.patch
22 +++ /dev/null
23 @@ -1,18 +0,0 @@
24 -Gentoo currently uses unversioned lua:0 - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
25 -
26 -diff --git a/configure.ac b/configure.ac
27 -index 810a288..51ca607 100644
28 ---- a/configure.ac
29 -+++ b/configure.ac
30 -@@ -305,9 +305,9 @@ else
31 - fi
32 -
33 - if test "x$found_lua51" != "xyes"; then
34 -- PKG_CHECK_EXISTS([lua5.1 >= $LUA51_REQUIRED], [
35 -+ PKG_CHECK_EXISTS([lua >= $LUA51_REQUIRED], [
36 - found_lua51=yes
37 -- with_lua51=lua5.1
38 -+ with_lua51=lua
39 - ], [
40 - found_lua51=no
41 - ])
42
43 diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
44 deleted file mode 100644
45 index 021c7d5e..00000000
46 --- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
47 +++ /dev/null
48 @@ -1,84 +0,0 @@
49 -# Copyright 1999-2018 Gentoo Foundation
50 -# Distributed under the terms of the GNU General Public License v2
51 -
52 -EAPI=6
53 -GNOME2_LA_PUNT="yes"
54 -PYTHON_COMPAT=( python{3_4,3_5,3_6} )
55 -
56 -inherit autotools eutils gnome2 multilib python-single-r1 virtualx
57 -
58 -DESCRIPTION="A GObject plugins library"
59 -HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
60 -
61 -LICENSE="LGPL-2+"
62 -SLOT="0"
63 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
64 -
65 -IUSE="+gtk glade lua luajit +python"
66 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
67 -
68 -RDEPEND="
69 - >=dev-libs/glib-2.38:2
70 - >=dev-libs/gobject-introspection-1.39:=
71 - glade? ( >=dev-util/glade-3.9.1:3.10 )
72 - gtk? ( >=x11-libs/gtk+-3:3[introspection] )
73 - lua? (
74 - >=dev-lua/lgi-0.9.0
75 - luajit? ( >=dev-lang/luajit-2:2 )
76 - !luajit? ( =dev-lang/lua-5.1*:0 ) )
77 - python? (
78 - ${PYTHON_DEPS}
79 - >=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
80 -"
81 -DEPEND="${RDEPEND}
82 - >=dev-util/gtk-doc-am-1.11
83 - >=dev-util/intltool-0.40
84 - virtual/pkgconfig
85 -
86 - dev-libs/gobject-introspection-common
87 - gnome-base/gnome-common
88 -"
89 -# eautoreconf needs gobject-introspection-common, gnome-common
90 -
91 -pkg_setup() {
92 - use python && python-single-r1_pkg_setup
93 -}
94 -
95 -src_prepare() {
96 - # Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
97 - eapply "${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
98 - eautoreconf
99 - gnome2_src_prepare
100 -}
101 -
102 -src_configure() {
103 - # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
104 - # What do we do about gdb, valgrind, gcov, etc?
105 - local myconf=(
106 - $(use_enable glade glade-catalog)
107 - $(use_enable gtk)
108 - --disable-static
109 -
110 - # py2 not supported anymore
111 - --disable-python2
112 - $(use_enable python python3)
113 -
114 - # lua
115 - $(use_enable lua lua5.1)
116 - $(use_enable $(usex luajit lua luajit) luajit)
117 - )
118 -
119 - gnome2_src_configure "${myconf[@]}"
120 -}
121 -
122 -src_test() {
123 - # This looks fixed since 1.18.0:
124 - #
125 - # FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
126 - # DO NOT REPORT UPSTREAM, this is not a libpeas bug.
127 - # To reproduce:
128 - # >>> from gi.repository import Gtk
129 - # >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
130 - # This should return True, it returns False for Xvfb
131 - virtx emake check
132 -}
133
134 diff --git a/dev-libs/libpeas/libpeas-9999.ebuild b/dev-libs/libpeas/libpeas-9999.ebuild
135 deleted file mode 100644
136 index f18229ac..00000000
137 --- a/dev-libs/libpeas/libpeas-9999.ebuild
138 +++ /dev/null
139 @@ -1,96 +0,0 @@
140 -# Copyright 1999-2015 Gentoo Foundation
141 -# Distributed under the terms of the GNU General Public License v2
142 -# $Id$
143 -
144 -EAPI="5"
145 -GCONF_DEBUG="no"
146 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
147 -
148 -inherit gnome2 multilib python-r1 virtualx
149 -if [[ ${PV} = 9999 ]]; then
150 - inherit gnome2-live
151 -fi
152 -
153 -DESCRIPTION="A GObject plugins library"
154 -HOMEPAGE="http://developer.gnome.org/libpeas/stable/"
155 -
156 -LICENSE="LGPL-2+"
157 -SLOT="0"
158 -IUSE="+gtk glade jit lua +python"
159 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
160 -if [[ ${PV} = 9999 ]]; then
161 - IUSE="${IUSE} doc"
162 - KEYWORDS=""
163 -else
164 - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
165 -fi
166 -
167 -RDEPEND="
168 - >=dev-libs/glib-2.38:2
169 - >=dev-libs/gobject-introspection-1.39
170 - glade? ( >=dev-util/glade-3.9.1:3.10 )
171 - gtk? ( >=x11-libs/gtk+-3:3[introspection] )
172 - lua? (
173 - dev-lua/lgi
174 - jit? ( >=dev-lang/luajit-2:2 )
175 - !jit? ( >=dev-lang/lua-5.1:0 ) )
176 - python? (
177 - ${PYTHON_DEPS}
178 - >=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
179 -"
180 -DEPEND="${RDEPEND}
181 - >=dev-util/gtk-doc-am-1.11
182 - >=dev-util/intltool-0.40
183 - virtual/pkgconfig
184 -"
185 -
186 -if [[ ${PV} = 9999 ]]; then
187 - DEPEND="${DEPEND} doc? ( >=dev-util/gtk-doc-1.11 )"
188 -fi
189 -
190 -src_configure() {
191 - # Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
192 - # What do we do about gdb, valgrind, gcov, etc?
193 - local myconf=(
194 - $(use_enable glade glade-catalog)
195 - $(use_enable gtk)
196 - --disable-static
197 -
198 - # possibly overriden below
199 - --disable-python{2,3}
200 - --disable-lua5.1
201 - --disable-luajit
202 - )
203 -
204 - if use lua ; then
205 - if use jit ; then
206 - myconf+=( --enable-luajit )
207 - else
208 - myconf+=( --enable-lua5.1 )
209 - fi
210 - fi
211 -
212 - python_configure() {
213 - local v
214 - python_is_python3 && v=3 || v=2
215 - myconf+=(
216 - "--enable-python${v}"
217 - # it is just 'PYTHON' for py3 in the build system
218 - "PYTHON${v#3}=${PYTHON}"
219 - "PYTHON${v}_CONFIG=${PYTHON}-config"
220 - )
221 - }
222 - use python && python_foreach_impl python_configure
223 -
224 - gnome2_src_configure "${myconf[@]}"
225 -}
226 -
227 -src_test() {
228 - # FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
229 - # DO NOT REPORT UPSTREAM, this is not a libpeas bug.
230 - # To reproduce:
231 - # >>> from gi.repository import Gtk
232 - # >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
233 - # This should return True, it returns False for Xvfb
234 - Xemake check
235 -}
236
237 diff --git a/dev-libs/libpeas/metadata.xml b/dev-libs/libpeas/metadata.xml
238 deleted file mode 100644
239 index f955af2b..00000000
240 --- a/dev-libs/libpeas/metadata.xml
241 +++ /dev/null
242 @@ -1,13 +0,0 @@
243 -<?xml version="1.0" encoding="UTF-8"?>
244 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
245 -<pkgmetadata>
246 - <maintainer type="project">
247 - <email>gnome@g.o</email>
248 - <name>Gentoo GNOME Desktop</name>
249 - </maintainer>
250 - <use>
251 - <flag name="glade">Install the glade catalog</flag>
252 - <flag name="python">Build support for loading <pkg>dev-lang/python</pkg>
253 - plugins</flag>
254 - </use>
255 -</pkgmetadata>