Apply patches from Dane Smith <smithdanea@gmail.com> to respect LDFLAGS,CC, ebuild QA fixes. Bug #331859

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 103 insertions, 20 deletions

diff --git a/app-misc/mouseremote/ChangeLog b/app-misc/mouseremote/ChangeLog
index 6e29fed4c36b..4756d6031bca 100644
--- a/app-misc/mouseremote/ChangeLog
+++ b/app-misc/mouseremote/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/mouseremote
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mouseremote/ChangeLog,v 1.12 2007/05/14 16:47:40 bangert Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mouseremote/ChangeLog,v 1.13 2010/08/13 15:31:08 hwoarang Exp $
+
+*mouseremote-0.90-r1 (13 Aug 2010)
+
+  13 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  +mouseremote-0.90-r1.ebuild, +files/mouseremote-0.90-makefile.diff,
+  files/mouseremote-gentoo.diff:
+  Apply patches from Dane Smith <smithdanea@gmail.com> to respect
+  LDFLAGS,CC, ebuild QA fixes. Bug #331859
 
   14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/app-misc/mouseremote/Manifest b/app-misc/mouseremote/Manifest
index 504739b1168d..87dc4c24c482 100644
--- a/app-misc/mouseremote/Manifest
+++ b/app-misc/mouseremote/Manifest
@@ -1,7 +1,9 @@
-AUX mouseremote-gentoo.diff 1553 RMD160 8969b540a03d4e3904d598bd02d66f2cabe32aea SHA1 f6d3485c09bf1972a36dd0f3a93157228a4efe9b SHA256 0a73e5d96f3cc6766be427ca14ffa05d7f029a48a6bc60c466fa0a942ff1a851
+AUX mouseremote-0.90-makefile.diff 511 RMD160 91cdc8a563314a51c9098cc2f4057922eadffbb9 SHA1 24d8439f1da890b969bded0c54980c4fb58f070f SHA256 232e2f0d6db8a52114ba6f7045fdad26dfb355b2473ac791cc9a931bd0320a12
+AUX mouseremote-gentoo.diff 1130 RMD160 a9ad9f88d135dc5056ff3010ddb4de28e43d1454 SHA1 fe4ceaa44b44c2bc7eff352531186192a83e8f08 SHA256 28e0c6eb9799f34d511189fb8ccd515dd807fb758722b3b0f201d40cf35824c7
 AUX mouseremote.conf 581 RMD160 ce1c9190b6b7f44b12e40f3c806c02259d78d917 SHA1 be39ff503008dede30d9349d4fa2fae12e1ed35a SHA256 7adfa89726ea28274a76fb93d9a7f4c0678153c7059ff2b1d59da2fd0e48899e
 AUX mouseremote.start 718 RMD160 88dd87be6076e10a0812a6089e5b70d02e47b77c SHA1 5166bad3f89a6a0194a20120a9040f032cfd6d5d SHA256 d4d8379958b0c759072a37f512093a666cb5cb0592de7b00ae5b37d9a182c35d
 DIST MouseRemote.tar.gz 41752 RMD160 d33cfe287ed29b9620f24033b5eb84d5f13c7dee SHA1 6c3026e3d1470004318f3134a9abbd06db988985 SHA256 cde90093c11d7d5b398d2ff9448a7c67bfc3bfa26d71802dff2de715f179b50f
+EBUILD mouseremote-0.90-r1.ebuild 2084 RMD160 cabc84e4f4180958526b933ba8bb2bdd4305805f SHA1 0aec6d7933372bee1d58107f294f93a52ccbc3a8 SHA256 8b83815f677b0c9dc7120539faa60a2a2a4e3b0581877065ed405f49dedbbe48
 EBUILD mouseremote-0.90.ebuild 1903 RMD160 efc363b34679b516c4896e285d64e5642fa5c1db SHA1 bf9399ed31c270d7b59ada9bdec1dc7fd75bf191 SHA256 edf78a19d1a74d83b2563770cd3fcc9ffb127dc18878e61e0cc22b60fb18eaf9
-MISC ChangeLog 1239 RMD160 ec09c66676cbc51efb4093c477dbf95e8922e14b SHA1 fa5208666adf2c2d46d77f3a8a24e31f35f3f434 SHA256 761d50d20aac9dc0ee593256be6779cc04cbe949159f83533296489b1d882a7b
+MISC ChangeLog 1542 RMD160 ff026627f5ea14ab438349d96aa65513312d314d SHA1 1cb65fd94d6f6036fb31f866f0a8fca07a8e6be1 SHA256 16242632b99e7c491c34eb787f8453240716f1a465847802af30ddaf30f57dd6
 MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
diff --git a/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff b/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
new file mode 100644
index 000000000000..6f0354903011
--- /dev/null
+++ b/app-misc/mouseremote/files/mouseremote-0.90-makefile.diff
@@ -0,0 +1,20 @@
+--- MultiMouse/Makefile	1997-08-21 08:52:56.000000000 -0400
++++ MultiMouse/Makefile.new	2010-08-13 00:05:47.000000000 -0400
+@@ -20,14 +20,13 @@
+ 	-DMOUSE_FIFO=\"$(FIFO)\"\
+ 	-DLOCKDIR=\"$(LOCKDIR)\"\
+ 	-DMAX_MICE=$(MICE)
+-CFLAGS=	$(OPTS)\
+-	-O2 # -DDEBUG
+-LDLAGS=	-O2
++
++OUTPUT_OPTION= $(OPTS) -o $@
+ 
+ all:	$(TARGET)
+ 
+ multimoused:	$(OBJS)
+-	$(CC) -o $@ $(OBJS)
++	$(CC) $(LDFLAGS) -o $@ $(OBJS)
+ 
+ multimouse.1 multimoused.8 multimouse:	Makefile
+ 	sed -e 's|%LOCKDIR%|$(LOCKDIR)|' -e 's|%BINDIR%|$(BINDIR)|'\
diff --git a/app-misc/mouseremote/files/mouseremote-gentoo.diff b/app-misc/mouseremote/files/mouseremote-gentoo.diff
index 5c0963859078..d86902e37ed5 100644
--- a/app-misc/mouseremote/files/mouseremote-gentoo.diff
+++ b/app-misc/mouseremote/files/mouseremote-gentoo.diff
@@ -1,19 +1,3 @@
-diff -Naur MouseRemote.ORG/MultiMouse/Makefile MouseRemote/MultiMouse/Makefile
---- MouseRemote.ORG/MultiMouse/Makefile	Thu Aug 21 14:52:56 1997
-+++ MouseRemote/MultiMouse/Makefile	Sat May  4 15:49:16 2002
-@@ -20,10 +20,10 @@
- 	-DMOUSE_FIFO=\"$(FIFO)\"\
- 	-DLOCKDIR=\"$(LOCKDIR)\"\
- 	-DMAX_MICE=$(MICE)
--CFLAGS=	$(OPTS)\
--	-O2 # -DDEBUG
- LDLAGS=	-O2
- 
-+OUTPUT_OPTION= $(OPTS) -o $@
-+
- all:	$(TARGET)
- 
- multimoused:	$(OBJS)
 diff -Naur MouseRemote.ORG/client/MouseRemote.conf MouseRemote/client/MouseRemote.conf
 --- MouseRemote.ORG/client/MouseRemote.conf	Sat Oct  9 21:03:42 1999
 +++ MouseRemote/client/MouseRemote.conf	Sat May  4 16:04:43 2002
diff --git a/app-misc/mouseremote/mouseremote-0.90-r1.ebuild b/app-misc/mouseremote/mouseremote-0.90-r1.ebuild
new file mode 100644
index 000000000000..75d964b178d1
--- /dev/null
+++ b/app-misc/mouseremote/mouseremote-0.90-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mouseremote/mouseremote-0.90-r1.ebuild,v 1.1 2010/08/13 15:31:08 hwoarang Exp $
+
+inherit eutils
+
+S="${WORKDIR}/MouseRemote"
+DESCRIPTION="X10 MouseRemote"
+HOMEPAGE="http://www4.pair.com/gribnif/ha/"
+SRC_URI="http://www4.pair.com/gribnif/ha/MouseRemote.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/perl-Time-HiRes"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	
+	epatch "${FILESDIR}"/${P}-makefile.diff
+	epatch "${FILESDIR}"/${PN}-gentoo.diff
+}
+
+src_compile() {
+	cd MultiMouse && emake \
+		CC=$(tc-getCC) \
+		PREFIX=/usr \
+		LOCKDIR=/var/lock \
+	    JMANDIR=/usr/share/man/ja_JP.ujis || die
+}
+
+src_install() {
+	dobin MultiMouse/multimouse || die
+	dosbin MultiMouse/multimoused || die
+
+	dodoc README MultiMouse/README.jis MultiMouse/README.newstuff || die
+	newdoc MultiMouse/README README.MultiMouse || die
+	newdoc client/MouseRemote.conf MouseRemote.conf.dist || die
+	newdoc client/MouseRemote.pl MouseRemote.pl.dist || die
+	newdoc client/MouseRemoteKeys.pl MouseRemoteKeys.pl.dist || die
+
+	newinitd "${FILESDIR}"/mouseremote.start mouseremote || die
+	newconfd "${FILESDIR}"/mouseremote.conf mouseremote || die
+}
+
+pkg_postinst() {
+	[ -e /dev/mumse ] || mkfifo "${ROOT}"/dev/mumse
+	[ -e /dev/x10fifo ] || mkfifo "${ROOT}"/dev/x10fifo
+
+	elog "To use the mouse function in X, add the following to your XF86Config"
+	elog "Section \"InputDevice\""
+	elog "	Identifier  \"MouseREM\""
+	elog "	Driver      \"mouse\""
+	elog "	Option      \"Protocol\"      \"MouseSystems\""
+	elog "	Option      \"Device\"        \"/dev/mumse\""
+	elog "EndSection"
+	elog
+	elog "Don't forget to add the new device to the section \"ServerLayout\""
+	elog "like:	InputDevice \"MouseREM\" \"SendCoreEvents\""
+	elog
+	elog "Enable the daemon with \"rc-update add mouseremote default\"."
+	elog
+	elog "Configure the daemon is run in /etc/conf.d/mouseremote."
+	elog
+	elog "See /usr/share/doc/${PF} on how to configure the buttons."
+}