7 files changed, 26 insertions, 23 deletions
diff --git a/x11-proto/dmxproto/ChangeLog b/x11-proto/dmxproto/ChangeLog
index 6367b8226eb3..3ede727f6982 100644
--- a/x11-proto/dmxproto/ChangeLog
+++ b/x11-proto/dmxproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/dmxproto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/dmxproto/ChangeLog,v 1.30 2009/09/19 08:28:31 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/dmxproto/ChangeLog,v 1.31 2009/10/03 15:45:30 scarabeus Exp $
+
+*dmxproto-2.3 (03 Oct 2009)
+
+  03 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -dmxproto-2.2.99.1.ebuild, +dmxproto-2.3.ebuild:
+  Version bump for xorg-server 1.7. Remove old.
 
 *dmxproto-2.2.99.1 (19 Sep 2009)
 
diff --git a/x11-proto/dmxproto/dmxproto-2.2.99.1.ebuild b/x11-proto/dmxproto/dmxproto-2.3.ebuild
index 6b7493d88bfc..ea99c09b0339 100644
--- a/x11-proto/dmxproto/dmxproto-2.2.99.1.ebuild
+++ b/x11-proto/dmxproto/dmxproto-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/dmxproto/dmxproto-2.2.99.1.ebuild,v 1.1 2009/09/19 08:28:31 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/dmxproto/dmxproto-2.3.ebuild,v 1.1 2009/10/03 15:45:30 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-proto/inputproto/ChangeLog b/x11-proto/inputproto/ChangeLog
index 9b1ac95aeb7e..64606797e518 100644
--- a/x11-proto/inputproto/ChangeLog
+++ b/x11-proto/inputproto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-proto/inputproto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/ChangeLog,v 1.81 2009/09/30 19:44:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/ChangeLog,v 1.82 2009/10/03 15:50:05 scarabeus Exp $
+
+*inputproto-2.0 (03 Oct 2009)
+
+  03 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -inputproto-1.4.2.1.ebuild, -inputproto-1.9.99.902.ebuild,
+  +inputproto-2.0.ebuild:
+  Version bump for xorg-server 1.7. Remove old.
 
   30 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
   inputproto-1.5.1.ebuild:
diff --git a/x11-proto/inputproto/inputproto-1.4.2.1.ebuild b/x11-proto/inputproto/inputproto-1.4.2.1.ebuild
deleted file mode 100644
index 5089e777b15a..000000000000
--- a/x11-proto/inputproto/inputproto-1.4.2.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-1.4.2.1.ebuild,v 1.10 2009/05/05 15:13:15 fauli Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Input protocol headers"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/inputproto/inputproto-1.9.99.902.ebuild b/x11-proto/inputproto/inputproto-2.0.ebuild
index 93769d8edf8e..ffb08505ac4c 100644
--- a/x11-proto/inputproto/inputproto-1.9.99.902.ebuild
+++ b/x11-proto/inputproto/inputproto-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-1.9.99.902.ebuild,v 1.1 2009/09/19 08:47:14 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.0.ebuild,v 1.1 2009/10/03 15:50:05 scarabeus Exp $
 
 EAPI="2"
 
diff --git a/x11-proto/recordproto/ChangeLog b/x11-proto/recordproto/ChangeLog
index 40ca2b0d15a2..c70f7017f036 100644
--- a/x11-proto/recordproto/ChangeLog
+++ b/x11-proto/recordproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/recordproto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/recordproto/ChangeLog,v 1.28 2009/09/19 08:55:23 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/recordproto/ChangeLog,v 1.29 2009/10/03 15:52:06 scarabeus Exp $
+
+*recordproto-1.14 (03 Oct 2009)
+
+  03 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -recordproto-1.13.99.1.ebuild, +recordproto-1.14.ebuild:
+  Version bump for xorg-server 1.7. Remove old.
 
 *recordproto-1.13.99.1 (19 Sep 2009)
 
diff --git a/x11-proto/recordproto/recordproto-1.13.99.1.ebuild b/x11-proto/recordproto/recordproto-1.14.ebuild
index b3f43c6e66db..040be52431aa 100644
--- a/x11-proto/recordproto/recordproto-1.13.99.1.ebuild
+++ b/x11-proto/recordproto/recordproto-1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/recordproto/recordproto-1.13.99.1.ebuild,v 1.1 2009/09/19 08:55:23 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/recordproto/recordproto-1.14.ebuild,v 1.1 2009/10/03 15:52:06 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -13,5 +13,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
->=x11-misc/util-macros-1.2"
+DEPEND="${RDEPEND}"