Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/
Date: Sat, 07 Sep 2019 09:16:40
Message-Id: 1567847774.aea48b9efe2abf72a1878fda3bd6d9ebdc16d087.leio@gentoo
1 commit: aea48b9efe2abf72a1878fda3bd6d9ebdc16d087
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 7 09:16:14 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 7 09:16:14 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea48b9e
7
8 x11-libs/pango: security cleanup
9
10 Closes: https://bugs.gentoo.org/692110
11 Package-Manager: Portage-2.3.69, Repoman-2.3.12
12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
13
14 x11-libs/pango/pango-1.42.4-r1.ebuild | 71 -----------------------------------
15 x11-libs/pango/pango-1.42.4.ebuild | 66 --------------------------------
16 2 files changed, 137 deletions(-)
17
18 diff --git a/x11-libs/pango/pango-1.42.4-r1.ebuild b/x11-libs/pango/pango-1.42.4-r1.ebuild
19 deleted file mode 100644
20 index d23b3ac94f4..00000000000
21 --- a/x11-libs/pango/pango-1.42.4-r1.ebuild
22 +++ /dev/null
23 @@ -1,71 +0,0 @@
24 -# Copyright 1999-2019 Gentoo Authors
25 -# Distributed under the terms of the GNU General Public License v2
26 -
27 -EAPI=6
28 -GNOME2_LA_PUNT="yes"
29 -
30 -inherit gnome2 multilib-minimal toolchain-funcs
31 -
32 -DESCRIPTION="Internationalized text layout and rendering library"
33 -HOMEPAGE="https://www.pango.org/"
34 -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
35 -
36 -LICENSE="LGPL-2+ FTL"
37 -SLOT="0"
38 -KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
39 -
40 -IUSE="X +introspection test"
41 -
42 -RDEPEND="
43 - >=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
44 - >=dev-libs/glib-2.50.2:2[${MULTILIB_USEDEP}]
45 - >=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
46 - >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
47 - >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
48 - >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
49 - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
50 - X? (
51 - >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
52 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
53 - >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
54 - )
55 -"
56 -DEPEND="${RDEPEND}
57 - dev-util/glib-utils
58 - >=dev-util/gtk-doc-am-1.20
59 - virtual/pkgconfig[${MULTILIB_USEDEP}]
60 - test? ( media-fonts/cantarell )
61 - X? ( x11-base/xorg-proto )
62 - !<=sys-devel/autoconf-2.63:2.5
63 -"
64 -
65 -PATCHES=(
66 - "${WORKDIR}"/patches/ # bug fix cherry-picks from master by 20190216; each patch has commit id of origin/master included and will be part of 1.43.1/1.44
67 -)
68 -
69 -src_prepare() {
70 - gnome2_src_prepare
71 - # This should be updated if next release fails to pre-generate the manpage as well, or src_prepare removed if is properly generated
72 - # https://gitlab.gnome.org/GNOME/pango/issues/270
73 - cp -v "${FILESDIR}"/${PV}-pango-view.1.in "${S}/utils/pango-view.1.in" || die
74 -}
75 -
76 -multilib_src_configure() {
77 - tc-export CXX
78 -
79 - ECONF_SOURCE=${S} \
80 - gnome2_src_configure \
81 - --with-cairo \
82 - $(multilib_native_use_enable introspection) \
83 - $(use_with X xft) \
84 - "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
85 - "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
86 -
87 - if multilib_is_native_abi; then
88 - ln -s "${S}"/docs/html docs/html || die
89 - fi
90 -}
91 -
92 -multilib_src_install() {
93 - gnome2_src_install
94 -}
95
96 diff --git a/x11-libs/pango/pango-1.42.4.ebuild b/x11-libs/pango/pango-1.42.4.ebuild
97 deleted file mode 100644
98 index 43b3643e7dc..00000000000
99 --- a/x11-libs/pango/pango-1.42.4.ebuild
100 +++ /dev/null
101 @@ -1,66 +0,0 @@
102 -# Copyright 1999-2019 Gentoo Authors
103 -# Distributed under the terms of the GNU General Public License v2
104 -
105 -EAPI=6
106 -GNOME2_LA_PUNT="yes"
107 -
108 -inherit gnome2 multilib-minimal toolchain-funcs
109 -
110 -DESCRIPTION="Internationalized text layout and rendering library"
111 -HOMEPAGE="https://www.pango.org/"
112 -
113 -LICENSE="LGPL-2+ FTL"
114 -SLOT="0"
115 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
116 -
117 -IUSE="X +introspection test"
118 -
119 -RDEPEND="
120 - >=media-libs/harfbuzz-1.4.2:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
121 - >=dev-libs/glib-2.50.2:2[${MULTILIB_USEDEP}]
122 - >=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
123 - >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
124 - >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
125 - >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
126 - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
127 - X? (
128 - >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
129 - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
130 - >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
131 - )
132 -"
133 -DEPEND="${RDEPEND}
134 - dev-util/glib-utils
135 - >=dev-util/gtk-doc-am-1.20
136 - virtual/pkgconfig[${MULTILIB_USEDEP}]
137 - test? ( media-fonts/cantarell )
138 - X? ( x11-base/xorg-proto )
139 - !<=sys-devel/autoconf-2.63:2.5
140 -"
141 -
142 -src_prepare() {
143 - gnome2_src_prepare
144 - # This should be updated if next release fails to pre-generate the manpage as well, or src_prepare removed if is properly generated
145 - # https://gitlab.gnome.org/GNOME/pango/issues/270
146 - cp -v "${FILESDIR}"/${PV}-pango-view.1.in "${S}/utils/pango-view.1.in" || die
147 -}
148 -
149 -multilib_src_configure() {
150 - tc-export CXX
151 -
152 - ECONF_SOURCE=${S} \
153 - gnome2_src_configure \
154 - --with-cairo \
155 - $(multilib_native_use_enable introspection) \
156 - $(use_with X xft) \
157 - "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
158 - "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
159 -
160 - if multilib_is_native_abi; then
161 - ln -s "${S}"/docs/html docs/html || die
162 - fi
163 -}
164 -
165 -multilib_src_install() {
166 - gnome2_src_install
167 -}