diff options
author | Jeroen Roovers <jer@gentoo.org> | 2016-07-23 11:09:30 +0200 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2016-07-23 11:12:52 +0200 |
commit | 3c1142fb7ff1a3c58be62aea8852a9a99fa8843a (patch) | |
tree | 35f349b38287008856ac78e18eeaef1dc0ccff56 /x11-misc | |
parent | x11-apps/xkbset: Add Debian patch. (diff) | |
download | gentoo-3c1142fb7ff1a3c58be62aea8852a9a99fa8843a.tar.gz gentoo-3c1142fb7ff1a3c58be62aea8852a9a99fa8843a.tar.bz2 gentoo-3c1142fb7ff1a3c58be62aea8852a9a99fa8843a.zip |
x11-apps/xkbset: move to x11-misc/xkbset (bug #571860).
Package-Manager: portage-2.3.0
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/xkbset/Manifest | 2 | ||||
-rw-r--r-- | x11-misc/xkbset/files/xkbset-0.5-ldflags.patch | 11 | ||||
-rw-r--r-- | x11-misc/xkbset/metadata.xml | 10 | ||||
-rw-r--r-- | x11-misc/xkbset/xkbset-0.5-r1.ebuild | 41 | ||||
-rw-r--r-- | x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild | 53 |
5 files changed, 117 insertions, 0 deletions
diff --git a/x11-misc/xkbset/Manifest b/x11-misc/xkbset/Manifest new file mode 100644 index 000000000000..bbd57744889b --- /dev/null +++ b/x11-misc/xkbset/Manifest @@ -0,0 +1,2 @@ +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-misc/xkbset/files/xkbset-0.5-ldflags.patch b/x11-misc/xkbset/files/xkbset-0.5-ldflags.patch new file mode 100644 index 000000000000..440d428b7a68 --- /dev/null +++ b/x11-misc/xkbset/files/xkbset-0.5-ldflags.patch @@ -0,0 +1,11 @@ +--- 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-misc/xkbset/metadata.xml b/x11-misc/xkbset/metadata.xml new file mode 100644 index 000000000000..9cd3e9988810 --- /dev/null +++ b/x11-misc/xkbset/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> +<email>jer@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-misc/xkbset/xkbset-0.5-r1.ebuild b/x11-misc/xkbset/xkbset-0.5-r1.ebuild new file mode 100644 index 000000000000..217d3958d644 --- /dev/null +++ b/x11-misc/xkbset/xkbset-0.5-r1.ebuild @@ -0,0 +1,41 @@ +# 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-misc/xkbset/xkbset-0.5_p5_p1.ebuild b/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild new file mode 100644 index 000000000000..f21621ae5176 --- /dev/null +++ b/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild @@ -0,0 +1,53 @@ +# 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 +} |