Fix for bug 237940 & 238106

Missing IUSE added
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 129 insertions, 6 deletions

diff --git a/sys-kernel/kerneloops/ChangeLog b/sys-kernel/kerneloops/ChangeLog
index ab9de699ca9b..382b1dd31bc6 100644
--- a/sys-kernel/kerneloops/ChangeLog
+++ b/sys-kernel/kerneloops/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/kerneloops
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/ChangeLog,v 1.12 2008/09/15 22:38:48 gregkh Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/ChangeLog,v 1.13 2010/02/07 19:31:52 jlec Exp $
+
+*kerneloops-0.12-r1 (07 Feb 2010)
+
+  07 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/0.12-FLAGS.patch, kerneloops-0.12.ebuild,
+  +kerneloops-0.12-r1.ebuild:
+  Fix for bug 237940 & 238106
+  Missing IUSE added
 
 *kerneloops-0.12 (15 Sep 2008)
 
diff --git a/sys-kernel/kerneloops/Manifest b/sys-kernel/kerneloops/Manifest
index 85781536f6d9..06ff8655ae09 100644
--- a/sys-kernel/kerneloops/Manifest
+++ b/sys-kernel/kerneloops/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.12-FLAGS.patch 1682 RMD160 90b17f82e9663e6d386160393a11e274220f30b6 SHA1 c78f8bf7f08335315dcf1717514323b29730b229 SHA256 552d2c48aee8bc7ec2814cf4c1a44c3cf2535fe9eb5cc0f572d3477753f6e328
 AUX kerneloops 823 RMD160 ca0c79ed0d0703a223ad81d0a39cd7087dbbbcd8 SHA1 883ea68a35e1b256b2b4d0c4703d92a43855e16f SHA256 9dfc39001d382fd5a2bbdec0d988a4a0e028b553bbe579feb56ccf4916486fb7
 AUX makefile-standalone-0.10.patch 2199 RMD160 8c2cd11ba1969d9b81be1ecdbec6e1908f9176f6 SHA1 5c782a2ca9a5b606513621df960fd52bf290c52b SHA256 09a234e5e261a312a868dd40a3637b59e86544668c99e96d4f23bdbcb3dddc8a
 DIST kerneloops-0.10.tar.gz 60001 RMD160 f05cc382739dd6dfe981a8de0b146b2be70b5d20 SHA1 79a9eb61ceb846914370dd2a57453e92b5d2cd75 SHA256 ea3bb4779ec74e2af5556d8551dbde6460c41930d61d0f5ef9924dfb42229deb
@@ -5,6 +9,14 @@ DIST kerneloops-0.11.tar.gz 62847 RMD160 fd36a3330664411505025eb8fc7bd79e468da46
 DIST kerneloops-0.12.tar.gz 64374 RMD160 d095d3b2d2680e4b6726f19a42d0eba853e74adb SHA1 0dc86cff83fe3e91068a2d069fe4282c02cbbe22 SHA256 69bd49a7d3a4822d0ba541ebf5a9a956f057f0d26668191cdadb9ea06e886627
 EBUILD kerneloops-0.10.ebuild 1849 RMD160 c1088696006a5295ab467154c640663e5e9e0b63 SHA1 ed58307d78a7e35431f498d26c499663b5278f2f SHA256 56793752ea876bddef8d6f25704904c9fdff3a6eb7cb81cc4cc169012359a3f3
 EBUILD kerneloops-0.11.ebuild 1832 RMD160 6ae019f0e796b71dfbef806e34adf6502a94f4ea SHA1 47ae8636ab2cc005b3c9eb17013ab442bee7da32 SHA256 d58e3c106917ae02d7d4edbd9ad8cc6fe6fda9f9366999fc3a8514cbafb6e601
-EBUILD kerneloops-0.12.ebuild 1765 RMD160 0af36dc6bd565751e5ae5553021481ae557e2b95 SHA1 0f27d3fe588e4d21af961b3ebc9d40f1a57a1e0f SHA256 ebc764cd983edf1fa44b339990f46c2199c4a049a3a541d9c782e27e8b1bc545
-MISC ChangeLog 2404 RMD160 b1b395e8d429fad79b77895cab9faa004003da34 SHA1 fe5d53d39cadb35b67d70676215bbef69d173592 SHA256 802b160b1ade5d295060fcb26f14cf5089b5d5af7ea7435e13fec6d55d56ec91
+EBUILD kerneloops-0.12-r1.ebuild 1979 RMD160 26932098c7a6766614a515ffc1069e85eed735d7 SHA1 804edf3374d606574171e6d81cd434eedffb41f6 SHA256 5ed646f6a542af27dbea0ec5109be4520d909b4b5639c26e4ae4d0a56c24b204
+EBUILD kerneloops-0.12.ebuild 1771 RMD160 229b7a8822220abb6e676a1e83b2fcc9db30cad1 SHA1 38c180312a9eae731eb021064beecf01aeb869d5 SHA256 7b946bab14bd18b202574dd3c40f180dc3edf73ccb9a84617f67bff469b7ccd4
+MISC ChangeLog 2624 RMD160 2b7ba4b753644733f5995bf52d1ece8a68bd7822 SHA1 34cf1240267b9e9dcb9cb38107abd2cad9964abc SHA256 0647f2454344d2c8f5c7799ad441829b9b3105a895a4c206b1ded50ed820d13f
 MISC metadata.xml 520 RMD160 8bef03a02e948ae553d52cef165045c9be420f10 SHA1 adc0459291245a95de8ff4488a5e6dc6caecdb4a SHA256 cc54832a497a73c3fa1cf7bd267a665e9e1f011970f817062dc2951fd47137a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktvFS4ACgkQgAnW8HDreRbrywCfS98dRsYz20oQoaZa4lgOfUFo
+JXcAnj7/TakL3+4gqiqKeONqRLDxbHV6
+=wsRZ
+-----END PGP SIGNATURE-----
diff --git a/sys-kernel/kerneloops/files/0.12-FLAGS.patch b/sys-kernel/kerneloops/files/0.12-FLAGS.patch
new file mode 100644
index 000000000000..519ba22db129
--- /dev/null
+++ b/sys-kernel/kerneloops/files/0.12-FLAGS.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index 86acdf2..c2b8567 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,7 @@ LOCALESDIR=/usr/share/locale
+ MANDIR=/usr/share/man/man8
+ CC?=gcc
+ 
+-CFLAGS := -O2 -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wall -W -Wstrict-prototypes -Wundef -fno-common -Werror-implicit-function-declaration -Wdeclaration-after-statement
++CFLAGS ?= -O2 -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wall -W -Wstrict-prototypes -Wundef -fno-common -Werror-implicit-function-declaration -Wdeclaration-after-statement
+ 
+ MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0`
+ #
+@@ -18,8 +18,8 @@ MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0`
+ # are needed. -Wl,--as-needed tells the linker to just drop unused ones,
+ # and that makes the applet load faster and use less memory.
+ #
+-LDF_A := -Wl,--as-needed `pkg-config --libs libnotify gtk+-2.0`
+-LDF_D := -Wl,--as-needed `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs` -Wl,"-z relro" -Wl,"-z now" 
++LIBSA := `pkg-config --libs libnotify gtk+-2.0`
++LIBSD := `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs` 
+ 
+ all:	kerneloops kerneloops-applet kerneloops.8.gz
+ 
+@@ -30,11 +30,11 @@ noui:	kerneloops kerneloops.8.gz
+  
+ 
+ kerneloops:	kerneloops.o submit.o dmesg.o configfile.o kerneloops.h
+-	gcc kerneloops.o submit.o dmesg.o configfile.o $(LDF_D) -o kerneloops
++	$(CC) $(LDFLAGS) kerneloops.o submit.o dmesg.o configfile.o -o kerneloops $(LIBSD)
+ 	@(cd po/ && $(MAKE))
+ 
+ kerneloops-applet: kerneloops-applet.o
+-	gcc kerneloops-applet.o $(LDF_A)-o kerneloops-applet
++	$(CC) $(LDFLAGS) kerneloops-applet.o -o kerneloops-applet $(LIBSA)
+ 
+ kerneloops.8.gz: kerneloops.8
+ 	gzip -9 -c $< > $@
diff --git a/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild b/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild
new file mode 100644
index 000000000000..a549320282ba
--- /dev/null
+++ b/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild,v 1.1 2010/02/07 19:31:52 jlec Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool to automatically collect and submit Linux kernel crash signatures"
+HOMEPAGE="http://www.kerneloops.org/"
+SRC_URI="http://www.kerneloops.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-misc/curl
+		sys-apps/dbus
+		x11-libs/gtk+
+		x11-libs/libnotify
+		dev-util/desktop-file-utils"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-FLAGS.patch
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		kerneloops kerneloops-applet || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-system || die "Install of system failed"
+	emake DESTDIR="${D}" install-kerneloops || die "Install of deamon failed"
+	emake DESTDIR="${D}" install-applet || die "Install of applet failed"
+
+	doinitd "${FILESDIR}"/kerneloops || die "doinitd failed"
+
+	dosed 's:\(nodaemon\):\1 --file "${LOGFILE}":g' /etc/init.d/${PN}
+
+	cat >> "${T}"/kerneloops <<- EOF
+	# Change this according to your syslogger
+	LOGFILE="/var/log/messages"
+	EOF
+
+	doconfd "${T}"/kerneloops
+}
+
+pkg_postinst() {
+	ewarn "PRIVACY NOTE"
+	ewarn "You must allow the kerneloops program to send the oops messages"
+	ewarn "by either editing the /etc/kerneloops.conf file, or by running the"
+	ewarn "kerneloops-applet program first."
+	ewarn "Enabling this option will cause your system to submit certain kernel"
+	ewarn "output to the kerneloops.org website, where it will be available via"
+	ewarn "this website to developers and everyone else."
+	ewarn "The submitted info are so-called \"oopses\", kernel crash signature."
+	ewarn "However, due to the nature of oopses, it may happen that a few"
+	ewarn "surrounding lines of the oops in the \"dmesg\" are being sent together"
+	ewarn "with the oops."
+}
diff --git a/sys-kernel/kerneloops/kerneloops-0.12.ebuild b/sys-kernel/kerneloops/kerneloops-0.12.ebuild
index f17403c62cae..d9913586657c 100644
--- a/sys-kernel/kerneloops/kerneloops-0.12.ebuild
+++ b/sys-kernel/kerneloops/kerneloops-0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.12.ebuild,v 1.1 2008/09/15 22:38:48 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.12.ebuild,v 1.2 2010/02/07 19:31:52 jlec Exp $
 
 inherit eutils
 
@@ -11,6 +11,7 @@ SRC_URI="http://www.kerneloops.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 DEPEND="net-misc/curl
 		sys-apps/dbus