From efff13b353195a6b35c85c1d22cacecc75beace7 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gentoo.org>
Date: Mon, 22 Jul 2019 10:24:51 -0700
Subject: x11-misc/xkeyboard-config: Drop old versions

Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 x11-misc/xkeyboard-config/Manifest                 |  2 -
 ...yboard-config-2.26-Fixed-broken-pt-layout.patch | 84 ----------------------
 .../xkeyboard-config/xkeyboard-config-2.25.ebuild  | 51 -------------
 .../xkeyboard-config-2.26-r1.ebuild                | 55 --------------
 4 files changed, 192 deletions(-)
 delete mode 100644 x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch
 delete mode 100644 x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
 delete mode 100644 x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index d59ff364863f..cc004ae4c20a 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,3 +1 @@
-DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
-DIST xkeyboard-config-2.26.tar.bz2 1061733 BLAKE2B d07bbe28d5621aa146fdca089f60ebf293aa9b39b60fb6f7335cef934ff9edc6a11475ff00b7279a960cd9941f91260f25b7502fbe421bd8bf5c0da53f7a3471 SHA512 5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef
 DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch
deleted file mode 100644
index 4728e4bebff3..000000000000
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.26-Fixed-broken-pt-layout.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001
-From: Sergey Udaltsov <sergey.udaltsov@gmail.com>
-Date: Thu, 7 Feb 2019 20:40:35 +0000
-Subject: [PATCH] Fixed broken pt layout
-
-Backticks broke it, removed
----
- symbols/pt | 62 +++++++++++++++++++++++++++---------------------------
- 1 file changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/symbols/pt b/symbols/pt
-index 73a1b7b..3ec0981 100644
---- a/symbols/pt
-+++ b/symbols/pt
-@@ -221,35 +221,35 @@ xkb_symbols "colemak" {
- 
-     name[Group1]="Portuguese (Colemak)";
- 
--    key `<AD01>`  { [         q,          Q,           at,   Greek_OMEGA ] };
--    key `<AD02>`  { [         w,          W,      lstroke,       Lstroke ] };
--    key `<AD03>`  { [         f,          F,      dstroke,   ordfeminine ] };
--    key `<AD04>`  { [         p,          P,        thorn,         THORN ] };
--    key `<AD05>`  { [         g,          G,          eng,           ENG ] };
--    key `<AD06>`  { [         j,          J,    dead_hook,     dead_horn ] };
--    key `<AD07>`  { [         l,          L,      lstroke,       Lstroke ] };
--    key `<AD08>`  { [         u,          U,    downarrow,       uparrow ] };
--    key `<AD09>`  { [         y,          Y,    leftarrow,           yen ] };
--    key `<AD10>`  { [  ccedilla,   Ccedilla,   dead_acute, dead_doubleacute ] };
--
--    key `<AC01>`  { [         a,          A,           ae,           AE ] };
--    key `<AC02>`  { [         r,          R,    paragraph,   registered ] };
--    key `<AC03>`  { [         s,          S,       ssharp,      section ] };
--    key `<AC04>`  { [         t,          T,       tslash,       Tslash ] };
--    key `<AC05>`  { [         d,          D,          eth,          ETH ] };
--    key `<AC06>`  { [         h,          H,      hstroke,      Hstroke ] };
--    key `<AC07>`  { [         n,          N,            n,            N ] };
--    key `<AC08>`  { [         e,          E,     EuroSign,         cent ] };
--    key `<AC09>`  { [         i,          I,   rightarrow,     idotless ] };
--    key `<AC10>`  { [         o,          O,       oslash,     Ooblique ] };
--
--    key `<AB01>`  { [         z,          Z, guillemotleft,        less ] };
--    key `<AB02>`  { [         x,          X, guillemotright,    greater ] };
--    key `<AB03>`  { [         c,          C,         cent,    copyright ] };
--    key `<AB04>`  { [         v,          V, leftdoublequotemark, leftsinglequotemark ]   };
--    key `<AB05>`  { [         b,          B, rightdoublequotemark, rightsinglequotemark ] };
--    key `<AB08>`  { [         k,          K,          kra,    ampersand ] };
--    key `<AB07>`  { [         m,          M,           mu,    masculine ] };
--
--    key `<CAPS>` { [    BackSpace,    BackSpace,       BackSpace,        BackSpace ] };
-+    key <AD01>  { [         q,          Q,           at,   Greek_OMEGA ] };
-+    key <AD02>  { [         w,          W,      lstroke,       Lstroke ] };
-+    key <AD03>  { [         f,          F,      dstroke,   ordfeminine ] };
-+    key <AD04>  { [         p,          P,        thorn,         THORN ] };
-+    key <AD05>  { [         g,          G,          eng,           ENG ] };
-+    key <AD06>  { [         j,          J,    dead_hook,     dead_horn ] };
-+    key <AD07>  { [         l,          L,      lstroke,       Lstroke ] };
-+    key <AD08>  { [         u,          U,    downarrow,       uparrow ] };
-+    key <AD09>  { [         y,          Y,    leftarrow,           yen ] };
-+    key <AD10>  { [  ccedilla,   Ccedilla,   dead_acute, dead_doubleacute ] };
-+
-+    key <AC01>  { [         a,          A,           ae,           AE ] };
-+    key <AC02>  { [         r,          R,    paragraph,   registered ] };
-+    key <AC03>  { [         s,          S,       ssharp,      section ] };
-+    key <AC04>  { [         t,          T,       tslash,       Tslash ] };
-+    key <AC05>  { [         d,          D,          eth,          ETH ] };
-+    key <AC06>  { [         h,          H,      hstroke,      Hstroke ] };
-+    key <AC07>  { [         n,          N,            n,            N ] };
-+    key <AC08>  { [         e,          E,     EuroSign,         cent ] };
-+    key <AC09>  { [         i,          I,   rightarrow,     idotless ] };
-+    key <AC10>  { [         o,          O,       oslash,     Ooblique ] };
-+
-+    key <AB01>  { [         z,          Z, guillemotleft,        less ] };
-+    key <AB02>  { [         x,          X, guillemotright,    greater ] };
-+    key <AB03>  { [         c,          C,         cent,    copyright ] };
-+    key <AB04>  { [         v,          V, leftdoublequotemark, leftsinglequotemark ]   };
-+    key <AB05>  { [         b,          B, rightdoublequotemark, rightsinglequotemark ] };
-+    key <AB08>  { [         k,          K,          kra,    ampersand ] };
-+    key <AB07>  { [         m,          M,           mu,    masculine ] };
-+
-+    key <CAPS> { [    BackSpace,    BackSpace,       BackSpace,        BackSpace ] };
- };
--- 
-2.19.2
-
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
deleted file mode 100644
index ba23a9053296..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.25.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit autotools git-r3
-	# x11-misc/util-macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
-DEPEND="
-	${LIVE_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-		--enable-compat-rules
-		# do not check for runtime deps
-		--disable-runtime-deps
-		--with-xkb-rules-symlink=xorg
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
deleted file mode 100644
index 42d76fa397a9..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit autotools git-r3
-	# x11-misc/util-macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
-DEPEND="
-	${LIVE_DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Fixed-broken-pt-layout.patch
-)
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-		--enable-compat-rules
-		# do not check for runtime deps
-		--disable-runtime-deps
-		--with-xkb-rules-symlink=xorg
-	)
-
-	econf "${econfargs[@]}"
-}
-- 
cgit v1.2.3-65-gdbad