Remove old version; revision bump to fix bug #345351 by Anton Bolsharov.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

5 files changed, 70 insertions, 52 deletions

diff --git a/sys-apps/lomoco/ChangeLog b/sys-apps/lomoco/ChangeLog
index c9927b704f76..bd93256e7ee8 100644
--- a/sys-apps/lomoco/ChangeLog
+++ b/sys-apps/lomoco/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/lomoco
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/ChangeLog,v 1.11 2011/01/28 15:34:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/ChangeLog,v 1.12 2011/03/27 19:38:42 flameeyes Exp $
+
+*lomoco-1.0-r5 (27 Mar 2011)
+
+  27 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org> -lomoco-1.0-r2.ebuild,
+  +lomoco-1.0-r5.ebuild, +files/lomoco-pm-utils, metadata.xml:
+  Remove old version; revision bump to fix bug #345351 by Anton Bolsharov.
 
   28 Jan 2011; Markos Chandras <hwoarang@gentoo.org> lomoco-1.0-r4.ebuild:
   Stable on amd64 wrt bug #352993
diff --git a/sys-apps/lomoco/files/lomoco-pm-utils b/sys-apps/lomoco/files/lomoco-pm-utils
new file mode 100644
index 000000000000..f79dae7fc7f2
--- /dev/null
+++ b/sys-apps/lomoco/files/lomoco-pm-utils
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+case "$1" in
+    thaw|resume)
+        /usr/libexec/lomoco-helper
+        ;;
+esac
diff --git a/sys-apps/lomoco/lomoco-1.0-r2.ebuild b/sys-apps/lomoco/lomoco-1.0-r2.ebuild
deleted file mode 100644
index 92538f8b9fb4..000000000000
--- a/sys-apps/lomoco/lomoco-1.0-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/lomoco-1.0-r2.ebuild,v 1.3 2010/03/07 12:39:27 hollow Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="Lomoco can configure vendor-specific options on Logitech USB mice."
-HOMEPAGE="http://lomoco.linux-gamers.net/"
-SRC_URI="http://lomoco.linux-gamers.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~x86"
-IUSE=""
-
-DEPEND="=virtual/libusb-0*"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo-hardware-support.patch
-	epatch "${FILESDIR}"/${P}-updated-udev.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf
-	emake || die "make failed"
-	awk -f udev/toudev.awk < src/lomoco.c > udev/40-lomoco.rules \
-		|| die "failed to create udev rules"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc/udev/rules.d
-	doins udev/40-lomoco.rules
-
-	insinto /etc
-	doins "${FILESDIR}"/lomoco.conf
-
-	insinto /lib/udev
-	insopts -m 0755
-	newins udev/udev.lomoco lomoco
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/sys-apps/lomoco/lomoco-1.0-r5.ebuild b/sys-apps/lomoco/lomoco-1.0-r5.ebuild
new file mode 100644
index 000000000000..d777fe5829c3
--- /dev/null
+++ b/sys-apps/lomoco/lomoco-1.0-r5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lomoco/lomoco-1.0-r5.ebuild,v 1.1 2011/03/27 19:38:42 flameeyes Exp $
+
+EAPI="4"
+
+inherit autotools eutils multilib
+
+DESCRIPTION="Lomoco can configure vendor-specific options on Logitech USB mice."
+HOMEPAGE="http://www.lomoco.org/"
+SRC_URI="http://www.lomoco.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE=""
+
+DEPEND="=virtual/libusb-0*"
+RDEPEND="${DEPEND}
+	!<sys-fs/udev-114"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo-hardware-support.patch
+	epatch "${FILESDIR}"/${P}-updated-udev.patch
+	eautoreconf
+}
+
+src_compile() {
+	emake || die "make failed"
+	awk -f udev/toudev.awk < src/lomoco.c > udev/40-lomoco.rules \
+		|| die "failed to create udev rules"
+	sed -i -e 's:RUN="lomoco":RUN+="lomoco-helper":' \
+		udev/40-lomoco.rules || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	insinto /$(get_libdir)/udev/rules.d
+	doins udev/40-lomoco.rules
+
+	insinto /etc
+	doins "${FILESDIR}"/lomoco.conf
+
+	exeinto /usr/libexec/
+	newexe udev/udev.lomoco lomoco-helper
+
+	exeinto /etc/pm/sleep.d
+	newexe "${FILESDIR}"/lomoco-pm-utils lomoco
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/sys-apps/lomoco/metadata.xml b/sys-apps/lomoco/metadata.xml
index 9f3fdee2246b..2d083ce3bc66 100644
--- a/sys-apps/lomoco/metadata.xml
+++ b/sys-apps/lomoco/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>