Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xxkb/
Date: Sat, 01 Apr 2017 10:25:03
Message-Id: 1491042244.4ed0fefe2e145760e6093649e258f93f3fd97457.soap@gentoo
1 commit: 4ed0fefe2e145760e6093649e258f93f3fd97457
2 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3 AuthorDate: Tue Mar 28 18:38:42 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 1 10:24:04 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed0fefe
7
8 x11-misc/xxkb: Remove old
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11 Closes: https://github.com/gentoo/gentoo/pull/4319
12
13 x11-misc/xxkb/Manifest | 1 -
14 x11-misc/xxkb/xxkb-1.11-r3.ebuild | 78 ---------------------------------------
15 2 files changed, 79 deletions(-)
16
17 diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
18 index a0c2b87bc9d..b215639ee38 100644
19 --- a/x11-misc/xxkb/Manifest
20 +++ b/x11-misc/xxkb/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST xxkb-1.11-src.tar.gz 37262 SHA256 596d465bd39b2b660c1d19390a82cc5515cbf8f7e9600e82135564469e11bd3c SHA512 12675bee3be5a37b5e471fa763e2f8600859d5621dcf7ea9f004bad8f2200035582661cfb36938e9606582a86570e6de99c30dcf2d988c96604daf1185592c14 WHIRLPOOL da14d3ee40c35efa1dc3eb3b5df17a53540ed9eb007a7b8a42039dbf8bb97052d27ee77d04b3f115c002daebc0a7229aafb855621b057ab294b45cecb5beed87
23 DIST xxkb-1.11.1-src.tar.gz 38123 SHA256 ceaa33bed81d8ae5bf77e89787d0736f7564c3de047c35a57bcbf6f4d1888142 SHA512 081629ccee41016cd468bd411c8584298bf64d4d791bf803490f6286a330401b933f895fbff2f4a6d1fcfe86c0490267f86d334436c1cea743ad08d97b26038f WHIRLPOOL 62b4847722ee8f23cc7db6f9bb21b1d01dacd2eb68d5d0db09933b9970c6846bc239d1388bd3d7ada2490a42ce1d56cffa1e1a7e55df029864ae426a0adaf96a
24 DIST xxkb-flags.tar.bz2 2541 SHA256 f777c676a58ecab97c242efd703c0e8056cc2a93bb5b7a2fdb1f677348d6727c SHA512 c75929bf78a8aa84ffb615c85c2ad70110a9f7b0465891651a57e4772eae5e0ded61d10197f430f9cdd0cf707903af3d0af4250ff1743fdd59d9ff19bc0c33a9 WHIRLPOOL 7c626b2e6ec805b888ebcaeba658978efcbd4528729966a087ac7692b6c2e18ee5deb6dcb5eefea5a31826dce3ebb9c81a87cfc9e01efa5c18d800d8cd0bad6f
25
26 diff --git a/x11-misc/xxkb/xxkb-1.11-r3.ebuild b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
27 deleted file mode 100644
28 index c480d326f81..00000000000
29 --- a/x11-misc/xxkb/xxkb-1.11-r3.ebuild
30 +++ /dev/null
31 @@ -1,78 +0,0 @@
32 -# Copyright 1999-2015 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=5
36 -inherit eutils multilib
37 -
38 -DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
39 -HOMEPAGE="https://sourceforge.net/projects/xxkb/"
40 -SRC_URI="
41 - mirror://sourceforge/${PN}/${P}-src.tar.gz
42 - svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 )
43 -"
44 -
45 -LICENSE="Artistic"
46 -SLOT="0"
47 -KEYWORDS="amd64 ppc x86"
48 -IUSE="svg"
49 -
50 -RDEPEND="
51 - x11-libs/libX11
52 - x11-libs/libXpm
53 - x11-libs/libXt
54 - svg? (
55 - dev-libs/glib:2
56 - gnome-base/librsvg:2
57 - x11-libs/gtk+:2
58 - )
59 -"
60 -DEPEND="
61 - ${RDEPEND}
62 - app-text/rman
63 - svg? ( virtual/pkgconfig )
64 - x11-misc/imake
65 -"
66 -
67 -S="${WORKDIR}/${PN}"
68 -
69 -src_prepare() {
70 - if use svg; then
71 - mv "${WORKDIR}"/flags . || die
72 - epatch "${FILESDIR}"/svg-flags.patch
73 - epatch "${FILESDIR}"/svg-appdefaults.patch
74 - fi
75 -
76 - epatch "${FILESDIR}"/missing_init.patch
77 -}
78 -
79 -src_configure() {
80 - xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die
81 -}
82 -
83 -src_compile() {
84 - emake \
85 - CDEBUGFLAGS="${CFLAGS}" \
86 - EXTRA_LIBRARIES="-lXext" \
87 - LOCAL_LDFLAGS="${LDFLAGS}" \
88 - PIXMAPDIR=/usr/share/xxkb \
89 - PROJECTROOT=/usr
90 -}
91 -
92 -src_install() {
93 - local myopts
94 - if use svg; then
95 - myopts="PIXMAPS=flags/de.svg flags/pl.svg flags/il.svg flags/by.svg \
96 - flags/ua.svg flags/su.svg flags/ru.svg flags/bg.svg flags/en.svg"
97 - else
98 - myopts="FOOBAR=buzz"
99 - fi
100 -
101 - emake "${myopts}" DESTDIR="${D}" install
102 - rm -r "${D}"/usr/$(get_libdir)/X11/app-defaults || die
103 -
104 - emake DESTDIR="${D}" install.man
105 -
106 - insinto /usr/share/xxkb
107 - use svg || doins "${FILESDIR}"/*.xpm
108 - dodoc README* CHANGES*
109 -}