bug 99097

(Portage version: 2.0.51.22-r2)

6 files changed, 83 insertions, 2 deletions

diff --git a/app-misc/sjog/ChangeLog b/app-misc/sjog/ChangeLog
index ce41c6c71dc8..a790676fcbc5 100644
--- a/app-misc/sjog/ChangeLog
+++ b/app-misc/sjog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/sjog
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sjog/ChangeLog,v 1.6 2005/01/01 15:23:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sjog/ChangeLog,v 1.7 2005/07/29 22:58:07 vanquirius Exp $
+
+*sjog-0.6-r1 (29 Jul 2005)
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/sjog-0.6-gcc4.patch, +metadata.xml, +sjog-0.6-r1.ebuild:
+  Use patch from bug 99097. Thanks to nosdr4g@hotmail.com.
 
   25 Apr 2004; Aron Griffis <agriffis@gentoo.org> sjog-0.6.ebuild:
   Add die following econf for bug 48950
diff --git a/app-misc/sjog/Manifest b/app-misc/sjog/Manifest
index d17e562fb283..9a3464519397 100644
--- a/app-misc/sjog/Manifest
+++ b/app-misc/sjog/Manifest
@@ -1,3 +1,7 @@
-MD5 1d68c7bffc5aca860a884b9de3b9c6ca ChangeLog 561
 MD5 95508ce1f37234f04111689345b98039 sjog-0.6.ebuild 569
+MD5 348cb8fe44968ae90e9fbc0f0d7383b9 sjog-0.6-r1.ebuild 857
+MD5 1d68c7bffc5aca860a884b9de3b9c6ca ChangeLog 561
+MD5 035a2156b3aec707f70a2c518efdce93 metadata.xml 211
+MD5 2a750f8b4b03076a9cffba46b1830f45 files/digest-sjog-0.6-r1 60
+MD5 dc868ae2ec81422ee7539efb2f3eee90 files/sjog-0.6-gcc4.patch 617
 MD5 2a750f8b4b03076a9cffba46b1830f45 files/digest-sjog-0.6 60
diff --git a/app-misc/sjog/files/digest-sjog-0.6-r1 b/app-misc/sjog/files/digest-sjog-0.6-r1
new file mode 100644
index 000000000000..3bff17b04432
--- /dev/null
+++ b/app-misc/sjog/files/digest-sjog-0.6-r1
@@ -0,0 +1 @@
+MD5 e1746b326cf44e5feb7e1de1c5091e95 sjog-0.6.tar.gz 154850
diff --git a/app-misc/sjog/files/sjog-0.6-gcc4.patch b/app-misc/sjog/files/sjog-0.6-gcc4.patch
new file mode 100644
index 000000000000..69c7138464d9
--- /dev/null
+++ b/app-misc/sjog/files/sjog-0.6-gcc4.patch
@@ -0,0 +1,29 @@
+--- src/sjog_brightness.c.orig	2002-01-13 23:28:41.000000000 +1300
++++ src/sjog_brightness.c		2005-07-15 23:08:56.000000000 +1200
+@@ -50,10 +50,7 @@
+            currentBrightness = 100;
+         sjog_set_brightness(currentBrightness);
+         break;
+-
+-     default:
+-
+-   }
++     }
+ 
+ }
+ 
+--- src/sjog_scroll.c.orig	2001-08-14 21:53:26.000000000 +1200
++++ src/sjog_scroll.c		2005-07-15 23:09:34.000000000 +1200
+@@ -62,11 +62,7 @@
+      case JOG_TOP:
+         sjog_scroll_up();
+         break;
+-
+-     default:
+-
+-   }
+-
++     }
+ }
+ 
+ /* -------------------------------------------------------------------------- */
diff --git a/app-misc/sjog/metadata.xml b/app-misc/sjog/metadata.xml
new file mode 100644
index 000000000000..181db3477023
--- /dev/null
+++ b/app-misc/sjog/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<!-- THIS PACKAGE NEEDS A MAINTAINER or HERD! -->
+</pkgmetadata>
+
diff --git a/app-misc/sjog/sjog-0.6-r1.ebuild b/app-misc/sjog/sjog-0.6-r1.ebuild
new file mode 100644
index 000000000000..7308b3492407
--- /dev/null
+++ b/app-misc/sjog/sjog-0.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sjog/sjog-0.6-r1.ebuild,v 1.1 2005/07/29 22:58:07 vanquirius Exp $
+
+inherit eutils
+
+DESCRIPTION="sjog - tool for the Sony Vaio jogdial"
+HOMEPAGE="http://sjog.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sjog/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="=x11-libs/gtk+-1.2*
+	media-libs/gdk-pixbuf
+	=dev-libs/glib-1.2*"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
+src_install() {
+	make DESTDIR=${D} install
+}
+
+pkg_postinst() {
+	einfo "Please ensure that the module sonypi is probed with the option"
+	einfo "useinput=0. For example:"
+	einfo
+	einfo "# modprobe sonypi useinput=0"
+	einfo
+	einfo "Otherwise, you will get multiple events being called."
+}