Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/gtk-vnc/
Date: Sun, 29 Apr 2018 00:08:48
Message-Id: 1524959972.d41b29d64e550e1a55cc2d81775864e440656b48.leio@gentoo
1 commit: d41b29d64e550e1a55cc2d81775864e440656b48
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 28 23:59:32 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 28 23:59:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41b29d6
7
8 net-libs/gtk-vnc: remove old
9
10 Package-Manager: Portage-2.3.28, Repoman-2.3.9
11
12 net-libs/gtk-vnc/Manifest | 1 -
13 net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild | 172 ----------------------------------
14 net-libs/gtk-vnc/metadata.xml | 3 -
15 3 files changed, 176 deletions(-)
16
17 diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
18 index 0261b499e83..127f1d5b52e 100644
19 --- a/net-libs/gtk-vnc/Manifest
20 +++ b/net-libs/gtk-vnc/Manifest
21 @@ -1,2 +1 @@
22 -DIST gtk-vnc-0.7.1.tar.xz 444380 BLAKE2B bad577dbc759f824d0ef342572363314d493cfcf7822db6356c6766422ecc46cc890ef54167bd3e215bb56a5059a2014c1c28b6e63c2451b21e5a923d7005cf1 SHA512 5d62f60e1c9fe70f93a9d21c529145459f0d59d588631597d533ecba94864271d1095599db9447ac4843814be61af7a7c947f69e5a9cd26db7e811f2c4e95f0c
23 DIST gtk-vnc-0.7.2.tar.xz 447088 BLAKE2B 539cc9214735cf73c6e578029b33892c3e2d0d1dc402f82fa6d8d107c9a410e551020d9201192b69e50b75bb8297919ab0961752251dcf0bd75823d7426e01b5 SHA512 b95b1da6ff512c466feaa6efc831e9c36c5a77390b518c647c60fddda9dd850eea8658174682ae135b95bfca7bf2b4e85a5e5ac9adb43e3ddd7aa690288655ce
24
25 diff --git a/net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild
26 deleted file mode 100644
27 index 84a5688172f..00000000000
28 --- a/net-libs/gtk-vnc/gtk-vnc-0.7.1.ebuild
29 +++ /dev/null
30 @@ -1,172 +0,0 @@
31 -# Copyright 1999-2018 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=6
35 -GNOME2_LA_PUNT="yes"
36 -PYTHON_COMPAT=( python2_7 )
37 -VALA_MIN_API_VERSION="0.16"
38 -VALA_USE_DEPEND="vapigen"
39 -
40 -inherit gnome2 multibuild python-r1 vala
41 -
42 -DESCRIPTION="VNC viewer widget for GTK"
43 -HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
44 -
45 -LICENSE="LGPL-2.1+"
46 -SLOT="0"
47 -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
48 -IUSE="examples +gtk3 +introspection pulseaudio python sasl vala"
49 -REQUIRED_USE="
50 - python? ( ${PYTHON_REQUIRED_USE} )
51 - vala? ( gtk3 introspection )
52 -"
53 -
54 -# libview is used in examples/gvncviewer -- no need
55 -# glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
56 -COMMON_DEPEND="
57 - >=dev-libs/glib-2.30.1:2
58 - >=dev-libs/libgcrypt-1.4.2:0=
59 - dev-libs/libgpg-error
60 - >=net-libs/gnutls-3.0:0=
61 - >=x11-libs/cairo-1.2
62 - >=x11-libs/gtk+-2.18:2
63 - x11-libs/libX11
64 - gtk3? ( >=x11-libs/gtk+-2.91.3:3[introspection?] )
65 - introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
66 - pulseaudio? ( media-sound/pulseaudio )
67 - python? (
68 - ${PYTHON_DEPS}
69 - >=dev-python/pygtk-2:2[${PYTHON_USEDEP}] )
70 - sasl? ( dev-libs/cyrus-sasl )
71 -"
72 -RDEPEND="${COMMON_DEPEND}"
73 -
74 -DEPEND="${COMMON_DEPEND}
75 - >=dev-lang/perl-5
76 - >=dev-util/intltool-0.40
77 - sys-devel/gettext
78 - virtual/pkgconfig
79 - vala? (
80 - $(vala_depend)
81 - >=dev-libs/gobject-introspection-0.9.4 )
82 -"
83 -# eautoreconf requires gnome-common
84 -
85 -compute_variants() {
86 - MULTIBUILD_VARIANTS=( 2.0 )
87 - use gtk3 && MULTIBUILD_VARIANTS+=( 3.0 )
88 -}
89 -
90 -src_prepare() {
91 - prepare() {
92 - mkdir -p "${BUILD_DIR}" || die
93 -
94 - if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
95 - python_foreach_impl prepare
96 - fi
97 - }
98 -
99 - local MULTIBUILD_VARIANTS
100 - compute_variants
101 - multibuild_foreach_variant prepare
102 -
103 - # Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk, upstream bug#744393
104 - sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
105 - -i src/Makefile.* || die
106 -
107 - vala_src_prepare
108 - gnome2_src_prepare
109 -}
110 -
111 -src_configure() {
112 - local myconf=(
113 - $(use_with examples)
114 - $(use_enable introspection)
115 - $(use_with pulseaudio)
116 - $(use_with sasl)
117 - --with-coroutine=gthread
118 - --without-libview
119 - --disable-static
120 - --disable-vala
121 - )
122 -
123 - configure_python() {
124 - ECONF_SOURCE="${S}" gnome2_src_configure \
125 - ${myconf[@]} \
126 - --with-gtk=2.0 \
127 - --with-python
128 - }
129 -
130 - configure_normal() {
131 - ECONF_SOURCE="${S}" gnome2_src_configure \
132 - ${myconf[@]} \
133 - --with-gtk=${MULTIBUILD_VARIANT} \
134 - --without-python
135 -
136 - # for gtk3, python support is via gobject-introspection
137 - # Ex: from gi.repository import GtkVnc
138 - if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
139 - python_foreach_impl run_in_build_dir configure_python
140 - fi
141 - }
142 -
143 - local MULTIBUILD_VARIANTS
144 - compute_variants
145 - multibuild_foreach_variant run_in_build_dir configure_normal
146 -}
147 -
148 -src_compile() {
149 - compile_python() {
150 - cd "${BUILD_DIR}"/src || die
151 - # CPPFLAGS set to help find includes for gvnc.override
152 - emake gtkvnc.la \
153 - VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
154 - CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src" \
155 - gtkvnc_la_LIBADD="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la" \
156 - gtkvnc_la_DEPENDENCIES="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la"
157 - }
158 -
159 - compile_normal() {
160 - gnome2_src_compile
161 -
162 - if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
163 - local GTK2_BUILDDIR="${BUILD_DIR}"
164 - python_foreach_impl run_in_build_dir compile_python
165 - fi
166 - }
167 -
168 - local MULTIBUILD_VARIANTS
169 - compute_variants
170 - multibuild_foreach_variant run_in_build_dir compile_normal
171 -}
172 -
173 -src_test() {
174 - local MULTIBUILD_VARIANTS
175 - compute_variants
176 -
177 - multibuild_foreach_variant run_in_build_dir default
178 -}
179 -
180 -src_install() {
181 - install_python() {
182 - cd "${BUILD_DIR}"/src || die
183 - emake install-pyexecLTLIBRARIES DESTDIR="${D}" \
184 - VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
185 - CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src" \
186 - gtkvnc_la_LIBADD="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la" \
187 - gtkvnc_la_DEPENDENCIES="${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la"
188 - }
189 -
190 - install_normal() {
191 - gnome2_src_install
192 -
193 - if [[ ${MULTIBUILD_ID} == 2.0 ]] && use python ; then
194 - local GTK2_BUILDDIR="${BUILD_DIR}"
195 - python_foreach_impl run_in_build_dir install_python
196 - fi
197 - }
198 -
199 - local MULTIBUILD_VARIANTS
200 - compute_variants
201 - multibuild_foreach_variant run_in_build_dir install_normal
202 -}
203
204 diff --git a/net-libs/gtk-vnc/metadata.xml b/net-libs/gtk-vnc/metadata.xml
205 index c977e3a032f..350044690a5 100644
206 --- a/net-libs/gtk-vnc/metadata.xml
207 +++ b/net-libs/gtk-vnc/metadata.xml
208 @@ -9,7 +9,4 @@
209 <email>virtualization@g.o</email>
210 <name>Gentoo Virtualization Project</name>
211 </maintainer>
212 - <use>
213 - <flag name="gtk3">Build the gtk3 gtk-vnc library and other gtk3 assets</flag>
214 - </use>
215 </pkgmetadata>