commit: b63789ec7ab872d2549657bd40f9c13866ba73ec Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Jul 23 09:10:22 2016 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Jul 23 09:12:57 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b63789ec
x11-apps/xkbset: move to x11-misc/xkbset (bug #571860). profiles/updates/3Q-2016 | 1 + x11-apps/xkbset/Manifest | 2 - x11-apps/xkbset/files/xkbset-0.5-ldflags.patch | 11 ------ x11-apps/xkbset/metadata.xml | 10 ----- x11-apps/xkbset/xkbset-0.5-r1.ebuild | 41 -------------------- x11-apps/xkbset/xkbset-0.5_p5_p1.ebuild | 53 -------------------------- 6 files changed, 1 insertion(+), 117 deletions(-) diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016 index 8da8dbc..81f7262 100644 --- a/profiles/updates/3Q-2016 +++ b/profiles/updates/3Q-2016 @@ -3,3 +3,4 @@ move app-portage/cpuinfo2cpuflags app-portage/cpuid2cpuflags move app-crypt/openssl-af_alg-engine app-crypt/af_alg slotmove >=dev-php/pecl-mailparse-3.0 0 7 move dev-perl/class-loader dev-perl/Class-Loader +move x11-apps/xkbset x11-misc/xkbset diff --git a/x11-apps/xkbset/Manifest b/x11-apps/xkbset/Manifest deleted file mode 100644 index bbd5774..0000000 --- a/x11-apps/xkbset/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST xkbset-0.5.tar.gz 13933 SHA256 01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172 SHA512 64de1a18076c0e0fd3e3189444b6033880028f53777566286caf935bfafcf062ccbd408d20926e2a4febb77d15b026349e0288f2aa93c815ddd9437b96589d8c WHIRLPOOL 225d5f0e35ed7efb7c6b122f87d607ba25dd5f3bf92e9daea1a580f7b488f7ad2141c57d755fbdda8c723de4d4c482846448ab341ebbec96bb0e118a713a946c -DIST xkbset_0.5-5.1.diff.gz 3744 SHA256 a50a099c79d6bfed830e98b7797b3adfe31fe4480cc20d3d31a7a363db2995ee SHA512 92c362653088d5249dc26959cc898d4f8882f77b410ae09bbb2f03972940ed64ee2864b6da3425692c5cfa2bfe3b34d8316f5d7aa619f25c6311ac7a91a8db4b WHIRLPOOL d87e38c617e1eb0981f6e98929b1e2d94395b5f14f2dc7daa6bcdcd64bcf8c692058295a59b020dcb22cdc01fd594ea83b2446176978f57b7402083ff853531d diff --git a/x11-apps/xkbset/files/xkbset-0.5-ldflags.patch b/x11-apps/xkbset/files/xkbset-0.5-ldflags.patch deleted file mode 100644 index 440d428..0000000 --- a/x11-apps/xkbset/files/xkbset-0.5-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -11,7 +11,7 @@ - all: xkbset xkbset.1 - - xkbset: getargs.o print.o usage.o main.o misc.o -- ${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} getargs.o print.o usage.o main.o misc.o -o $@ ${LIBS} -+ ${CC} ${CFLAGS} ${LDFLAGS} ${INC_PATH} ${LIB_PATH} getargs.o print.o usage.o main.o misc.o -o $@ ${LIBS} - - getargs.o: getargs.c xkbset.h - ${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} -c getargs.c diff --git a/x11-apps/xkbset/metadata.xml b/x11-apps/xkbset/metadata.xml deleted file mode 100644 index 9cd3e99..0000000 --- a/x11-apps/xkbset/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> -<email>j...@gentoo.org</email> -</maintainer> -<use> -<flag name="tk">Install the <pkg>dev-perl/Tk</pkg> based xkbset-gui utility</flag> -</use> -</pkgmetadata> diff --git a/x11-apps/xkbset/xkbset-0.5-r1.ebuild b/x11-apps/xkbset/xkbset-0.5-r1.ebuild deleted file mode 100644 index 217d395..0000000 --- a/x11-apps/xkbset/xkbset-0.5-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="User preference utility for XKB extensions for X" -HOMEPAGE="http://www.math.missouri.edu/~stephen/software/" -SRC_URI="http://www.math.missouri.edu/~stephen/software/xkbset/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="tk" - -CDEPEND=" - x11-libs/libX11 -" -DEPEND=" - ${CDEPEND} -" -RDEPEND=" - ${CDEPEND} - tk? ( dev-perl/Tk ) -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-ldflags.patch -} - -src_compile() { - emake CC=$(tc-getCC) INC_PATH= LIB_PATH= -} - -src_install() { - dobin xkbset - use tk && dobin xkbset-gui - doman xkbset.1 - dodoc README TODO -} diff --git a/x11-apps/xkbset/xkbset-0.5_p5_p1.ebuild b/x11-apps/xkbset/xkbset-0.5_p5_p1.ebuild deleted file mode 100644 index f21621a..0000000 --- a/x11-apps/xkbset/xkbset-0.5_p5_p1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit eutils toolchain-funcs versionator - -DEBIAN_P_MAJOR=$(get_version_component_range 3) -DEBIAN_P_MAJOR=${DEBIAN_P_MAJOR/p/} -DEBIAN_P_MINOR=$(get_version_component_range 4) -DEBIAN_P_MINOR=${DEBIAN_P_MINOR/p/} - -DESCRIPTION="User preference utility for XKB extensions for X" -HOMEPAGE="http://www.math.missouri.edu/~stephen/software/" -SRC_URI=" - http://www.math.missouri.edu/~stephen/software/${PN}/${P/_p*/}.tar.gz - mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEBIAN_P_MAJOR}.${DEBIAN_P_MINOR}.diff.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="tk" - -CDEPEND=" - x11-libs/libX11 -" -DEPEND=" - ${CDEPEND} -" -RDEPEND=" - ${CDEPEND} - tk? ( dev-perl/Tk ) -" - -S=${WORKDIR}/${P/_p*/} - -PATCHES=( - "${FILESDIR}"/${P/_p*/}-ldflags.patch - "${WORKDIR}"/${PN}_${PV/_p*}-${DEBIAN_P_MAJOR}.${DEBIAN_P_MINOR}.diff - "${WORKDIR}"/${P/_p*/}/debian/patches/02_clarify_errors.dpatch -) - -src_compile() { - emake CC=$(tc-getCC) INC_PATH= LIB_PATH= -} - -src_install() { - dobin xkbset - use tk && dobin xkbset-gui - doman xkbset.1 - dodoc README TODO -}