Revision bump to introduce static-libs USE flag (patch by Sean McGovern from bug #378283). Fix dependency on ncurses that was missing as RDEPEND. Update init script to use OpenRC's declarative syntax.

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

4 files changed, 174 insertions, 2 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 66c06cb66c65..38f38c3fd60d 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-libs/gpm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.89 2011/08/11 02:25:13 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.90 2012/10/26 20:45:14 flameeyes Exp $
+
+*gpm-1.20.6-r1 (26 Oct 2012)
+
+  26 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/gpm-1.20.6-disablestatic.patch, +files/gpm.rc6-2,
+  +gpm-1.20.6-r1.ebuild:
+  Revision bump to introduce static-libs USE flag (patch by Sean McGovern from
+  bug #378283). Fix dependency on ncurses that was missing as RDEPEND. Update
+  init script to use OpenRC's declarative syntax.
 
   11 Aug 2011; Mike Frysinger <vapier@gentoo.org> gpm-1.20.6.ebuild:
   Use virtual/yacc instead of hardcoding list ourselves.
diff --git a/sys-libs/gpm/files/gpm-1.20.6-disablestatic.patch b/sys-libs/gpm/files/gpm-1.20.6-disablestatic.patch
new file mode 100644
index 000000000000..cb51a71e6e91
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.6-disablestatic.patch
@@ -0,0 +1,66 @@
+From b28e69f92f0b0a690e01a7a9b9bc08ffa9e9bc5e Mon Sep 17 00:00:00 2001
+From: Sean McGovern <gseanmcg@gmail.com>
+Date: Mon, 27 Aug 2012 01:00:44 -0400
+Subject: [PATCH] configure: don't build static libgpm by default
+
+---
+ configure.ac    |   11 +++++++++++
+ src/Makefile.in |    6 ++++--
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7245826..899b92d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,6 +79,16 @@ AC_CHECK_HEADERS(sys/sysmacros.h linux/major.h linux/tty.h)
+ # Required headers
+ AC_CHECK_HEADERS(sys/socket.h,,[AC_MSG_ERROR([Required header file missing])])
+ 
++AC_ARG_ENABLE([static],
++[  --enable-static         build static libraries @<:@default=no@:>@])
++
++LIBGPM_A=
++
++AS_IF([test "x$enable_static" = "xyes"], [
++        LIBGPM_A=lib/libgpm.a
++])
++
++
+ AC_ARG_WITH(curses,
+ [  --without-curses        disable curses support even if curses found])
+ 
+@@ -138,6 +148,7 @@ AC_SUBST(ELISP)
+ AC_SUBST(SHLIB)
+ AC_SUBST(PICFLAGS)
+ AC_SUBST(SOLDFLAGS)
++AC_SUBST(LIBGPM_A)
+ AC_SUBST(CURSES_OBJS)
+ AC_SUBST(SHARED_LIBS)
+ AC_SUBST(lispdir)
+diff --git a/src/Makefile.in b/src/Makefile.in
+index da35a5d..d3b1dcd 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -79,7 +79,7 @@ prog/%:	prog/%.o
+ #		| $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'
+ 
+ # Do it all!
+-all:	gpm lib/libgpm.so.@abi_lev@ lib/libgpm.a $(PROG)
++all:	gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG)
+ 
+ gpm:	$(GOBJ)
+ 	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
+@@ -105,7 +105,9 @@ installdirs:
+ 
+ install:	check 
+ 	$(INSTALL_PROGRAM) gpm $(sbindir)/gpm
+-	$(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a
++	if [ -f lib/libgpm.a ] ; then \
++	$(INSTALL_DATA) -m 644 lib/libgpm.a $(libdir)/libgpm.a ; \
++	fi
+ 	$(INSTALL_DATA) -m 644 $(srcdir)/headers/gpm.h $(includedir)/gpm.h
+ 	# POSIX requires the range of a for loop be nonempty and Bash
+ 	# 2.x goes along; unfortunately that means an additional
+-- 
+1.7.8.6
+
diff --git a/sys-libs/gpm/files/gpm.rc6-2 b/sys-libs/gpm/files/gpm.rc6-2
new file mode 100644
index 000000000000..a93c059d0582
--- /dev/null
+++ b/sys-libs/gpm/files/gpm.rc6-2
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6-2,v 1.1 2012/10/26 20:45:14 flameeyes Exp $
+
+#NB: Config is in /etc/conf.d/gpm
+
+command=/usr/sbin/gpm
+command_args="-m ${MOUSEDEV} -t ${MOUSE} \
+${RESPONSIVENESS:+ -r ${RESPONSIVENESS}} \
+${REPEAT_TYPE:+ -R${REPEAT_TYPE}} \
+${APPEND:+ ${APPEND}}"
+
+pidfile=/var/run/gpm.pid
+
+depend() {
+	need localmount
+	use hotplug logger
+}
+
+start_pre() {
+	if [ -z "$MOUSEDEV" ] || [ -z "$MOUSE" ] ; then
+		eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first"
+		return 1
+	fi
+}
diff --git a/sys-libs/gpm/gpm-1.20.6-r1.ebuild b/sys-libs/gpm/gpm-1.20.6-r1.ebuild
new file mode 100644
index 000000000000..a06e8692e3e1
--- /dev/null
+++ b/sys-libs/gpm/gpm-1.20.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.6-r1.ebuild,v 1.1 2012/10/26 20:45:14 flameeyes Exp $
+
+# emacs support disabled due to #99533 #335900
+
+EAPI=4
+
+inherit eutils toolchain-funcs autotools
+
+DESCRIPTION="Console-based mouse driver"
+HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
+SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux static-libs"
+
+CDPEND="sys-libs/ncurses"
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	virtual/yacc"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-gpm )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/0001-daemon-use-sys-ioctl.h-for-ioctl.patch #222099
+	epatch "${FILESDIR}"/0001-fixup-make-warnings.patch #206291
+	epatch "${FILESDIR}"/${P}-disablestatic.patch #378283
+
+	# fix ABI values
+	sed -i \
+		-e 's/^abi_lev=.*$/abi_lev="1"/' \
+		-e 's/^abi_age=.*$/abi_age="20"/' \
+		configure.ac || die
+
+	# workaround broken release
+	find -name '*.o' -delete
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/gpm \
+		$(use_enable static-libs static) \
+		emacs=/bin/false
+}
+
+src_compile() {
+	# make sure nothing compiled is left
+	emake clean
+	emake EMACS=:
+}
+
+src_install() {
+	emake install DESTDIR="${D}" EMACS=: ELISP=""
+
+	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
+	gen_usr_ldscript -a gpm
+
+	insinto /etc/gpm
+	doins conf/gpm-*.conf
+
+	dodoc BUGS Changes README TODO
+	dodoc doc/Announce doc/FAQ doc/README*
+
+	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
+	newconfd "${FILESDIR}"/gpm.conf.d gpm
+}