Version bump. Remove old.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

5 files changed, 21 insertions, 167 deletions

diff --git a/x11-drivers/xf86-input-mtrack/ChangeLog b/x11-drivers/xf86-input-mtrack/ChangeLog
index 464d7417a200..a32eaef014d4 100644
--- a/x11-drivers/xf86-input-mtrack/ChangeLog
+++ b/x11-drivers/xf86-input-mtrack/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-input-mtrack
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mtrack/ChangeLog,v 1.10 2013/01/21 19:59:56 steev Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mtrack/ChangeLog,v 1.11 2015/03/26 17:19:19 chithanh Exp $
+
+*xf86-input-mtrack-0.3.1 (26 Mar 2015)
+
+  26 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xf86-input-mtrack-0.3.1.ebuild,
+  -files/xf86-input-mtrack-0.1.1-autoconf.patch,
+  -files/xf86-input-mtrack-0.1.1-export.patch,
+  -xf86-input-mtrack-0.1.1-r1.ebuild, -xf86-input-mtrack-0.2.0.ebuild:
+  Version bump. Remove old.
 
   21 Jan 2013; Steev Klimaszewski <steev@gentoo.org>
   xf86-input-mtrack-0.3.0.ebuild:
diff --git a/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-autoconf.patch b/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-autoconf.patch
deleted file mode 100644
index c9d87f170a74..000000000000
--- a/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-autoconf.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-new file mode 100644
-index 0000000..af437a6
---- /dev/null
-+++ Makefile.am
-@@ -0,0 +1 @@
-+SUBDIRS = src
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..4af69d9
---- /dev/null
-+++ configure.ac
-@@ -0,0 +1,57 @@
-+#                                               -*- Autoconf -*-
-+# Process this file with autoconf to produce a configure script.
-+
-+AC_PREREQ([2.60])
-+AC_INIT([xf86-input-mtrack], [1.0_rc2], [BUG-REPORT-ADDRESS])
-+AC_CONFIG_SRCDIR([driver/mtrack.c])
-+AC_CONFIG_HEADERS([config.h])
-+
-+AM_INIT_AUTOMAKE([foreign])
-+AM_MAINTAINER_MODE
-+
-+# Checks for programs.
-+AC_DISABLE_STATIC
-+AC_PROG_LIBTOOL
-+
-+# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION([1.8])
-+XORG_DEFAULT_OPTIONS
-+
-+# Obtain compiler/linker options from server and required extensions
-+PKG_CHECK_MODULES(XORG, xorg-server xproto inputproto)
-+
-+# Define a configure option for an alternate input module directory
-+AC_ARG_WITH(xorg-module-dir,
-+            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+                           [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-+            [moduledir="$withval"],
-+            [moduledir="$libdir/xorg/modules"])
-+inputdir=${moduledir}/input
-+AC_SUBST(inputdir)
-+
-+# Checks for libraries.
-+AC_CHECK_LIB([m], [sin])
-+AC_CHECK_LIB([mtdev], [mtdev_open])
-+
-+# Checks for header files.
-+AC_CHECK_HEADERS([fcntl.h stdint.h])
-+
-+# Checks for typedefs, structures, and compiler characteristics.
-+AC_C_INLINE
-+
-+# Checks for library functions.
-+AC_CHECK_FUNCS([memset])
-+
-+DRIVER_NAME=mtrack
-+AC_SUBST([DRIVER_NAME])
-+
-+AC_ARG_ENABLE(debug, "Debug gesture")
-+AC_ARG_ENABLE(debug,
-+              AS_HELP_STRING([--enable-debug],
-+                             [Enable debugging (default: disabled)]),
-+              [AC_DEFINE(DEBUG_GESTURE, 1, Enable gesture degbug)])
-+
-+AC_CONFIG_FILES([Makefile src/Makefile])
-+AC_OUTPUT
-diff --git a/src/Makefile.am b/src/Makefile.am
-new file mode 100644
-index 0000000..7484917
---- /dev/null
-+++ src/Makefile.am
-@@ -0,0 +1,16 @@
-+AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
-+AM_CPPFLAGS=-I$(top_srcdir)/include/
-+
-+@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
-+@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
-+@DRIVER_NAME@_drv_ladir = @inputdir@
-+
-+@DRIVER_NAME@_drv_la_SOURCES = \
-+	$(top_srcdir)/src/capabilities.c	\
-+	$(top_srcdir)/src/gestures.c		\
-+	$(top_srcdir)/src/hwstate.c		\
-+	$(top_srcdir)/src/mconfig.c		\
-+	$(top_srcdir)/src/mtouch.c		\
-+	$(top_srcdir)/src/mtstate.c		\
-+	$(top_srcdir)/src/trig.c		\
-+	$(top_srcdir)/driver/mtrack.c
diff --git a/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-export.patch b/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-export.patch
deleted file mode 100644
index 35f2cd25fd3a..000000000000
--- a/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-export.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/driver/mtrack.c b/driver/mtrack.c
-index 3b785a6..5d1f2a3 100644
---- a/driver/mtrack.c
-+++ b/driver/mtrack.c
-@@ -348,4 +348,4 @@ static pointer setup(pointer module, pointer options, int *errmaj, int *errmin)
- 	return module;
- }
- 
--XF86ModuleData mtrackModuleData = {&VERSION, &setup, NULL };
-+_X_EXPORT XF86ModuleData mtrackModuleData = {&VERSION, &setup, NULL };
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.1.1-r1.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.1.1-r1.ebuild
deleted file mode 100644
index d1a80c92fa04..000000000000
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.1.1-r1.ebuild,v 1.1 2011/05/21 07:13:35 naota Exp $
-
-EAPI=4
-
-XORG_EAUTORECONF=yes
-
-inherit xorg-2
-
-DESCRIPTION="Xorg Driver for Multitouch Trackpads"
-HOMEPAGE="https://github.com/BlueDragonX/xf86-input-mtrack"
-SRC_URI="http://github.com/BlueDragonX/xf86-input-mtrack/tarball/v${PV/_/-} -> ${P}.tar.gz"
-IUSE="debug"
-
-S="${WORKDIR}/BlueDragonX-xf86-input-mtrack-21f273e"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${RDEPEND}
-	>=sys-libs/mtdev-1.0"
-DEPEND="${DEPEND}
-	>=sys-libs/mtdev-1.0"
-
-DOCS=( "README" )
-
-PATCHES=( "${FILESDIR}"/${P}-autoconf.patch
-	"${FILESDIR}"/${P}-export.patch )
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable debug)
-	)
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-
-	elog
-	elog "To enable multitouch support add the following lines"
-	elog "to your xorg.conf:"
-	elog ""
-	elog "Section \"InputClass\""
-	elog "  MatchIsTouchpad \"true\""
-	elog "  Identifier      \"Touchpads\""
-	elog "  Driver          \"mtrack\""
-	elog "EndSection"
-	elog
-}
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.1.ebuild
index d1cb5095a9b1..33865e37e11c 100644
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.1.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild,v 1.4 2012/06/24 19:01:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.3.1.ebuild,v 1.1 2015/03/26 17:19:19 chithanh Exp $
 
-EAPI=4
+EAPI=5
 
 XORG_EAUTORECONF=yes
 
-inherit xorg-2
+inherit xorg-2 vcs-snapshot
 
 DESCRIPTION="Xorg Driver for Multitouch Trackpads"
 HOMEPAGE="https://github.com/BlueDragonX/xf86-input-mtrack"
 SRC_URI="http://github.com/BlueDragonX/xf86-input-mtrack/tarball/v${PV/_/-} -> ${P}.tar.gz"
 IUSE="debug"
 
-inherit autotools
-
-S="${WORKDIR}/BlueDragonX-xf86-input-mtrack-4d517e7"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="${RDEPEND}
 	>=sys-libs/mtdev-1.0"
 DEPEND="${DEPEND}
-	>=sys-libs/mtdev-1.0"
+	>=sys-libs/mtdev-1.0
+	x11-proto/randrproto
+	x11-proto/videoproto
+	x11-proto/xineramaproto"
 
 DOCS=( "README.md" )
-PATCHES=( "${FILESDIR}"/${P}-drop-mtrack-test.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.2.0-drop-mtrack-test.patch )
 
 pkg_setup() {
 	xorg-2_pkg_setup