summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2015-02-04 17:29:52 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2015-02-04 17:29:52 +0000
commit12416dd03178b79c265bc436517d3cee990e5ce9 (patch)
tree627f6c6f483005ad190befd020a82ddbc8fe55e1 /x11-apps
parentVersion bump. Remove old. (diff)
downloadgentoo-2-12416dd03178b79c265bc436517d3cee990e5ce9.tar.gz
gentoo-2-12416dd03178b79c265bc436517d3cee990e5ce9.tar.bz2
gentoo-2-12416dd03178b79c265bc436517d3cee990e5ce9.zip
Add x11-misc/xkeyboard-config to dependencies, bug #538000. Remove old.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/setxkbmap/ChangeLog8
-rw-r--r--x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild15
-rw-r--r--x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild9
3 files changed, 11 insertions, 21 deletions
diff --git a/x11-apps/setxkbmap/ChangeLog b/x11-apps/setxkbmap/ChangeLog
index e5464a6452f9..f78d8b3b1755 100644
--- a/x11-apps/setxkbmap/ChangeLog
+++ b/x11-apps/setxkbmap/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-apps/setxkbmap
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.67 2014/08/10 20:07:25 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.68 2015/02/04 17:29:52 chithanh Exp $
+
+ 04 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ -setxkbmap-1.2.0.ebuild, setxkbmap-1.3.0.ebuild:
+ Add x11-misc/xkeyboard-config to dependencies, bug #538000. Remove old.
10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> setxkbmap-1.2.0.ebuild,
setxkbmap-1.3.0.ebuild:
diff --git a/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild
deleted file mode 100644
index 34c2f9f36f4c..000000000000
--- a/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild,v 1.10 2014/08/10 20:07:25 slyfox Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="Controls the keyboard layout of a running X server"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-RDEPEND="x11-libs/libxkbfile
- x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
index bcecf0133dd7..a3695915f16e 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild,v 1.10 2014/08/10 20:07:25 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild,v 1.11 2015/02/04 17:29:52 chithanh Exp $
EAPI=4
@@ -10,6 +10,7 @@ DESCRIPTION="Controls the keyboard layout of a running X server"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
-RDEPEND="x11-libs/libxkbfile
+DEPEND="x11-libs/libxkbfile
x11-libs/libX11"
-DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+ x11-misc/xkeyboard-config"