Fix building with x11-libs/libnotify >= 0.7. Fix missing -I and -l flags for dbus-glib-1 in -FLAGS.patch. punt old

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

9 files changed, 77 insertions, 278 deletions

diff --git a/sys-kernel/kerneloops/ChangeLog b/sys-kernel/kerneloops/ChangeLog
index 382b1dd31bc6..259d95b6b158 100644
--- a/sys-kernel/kerneloops/ChangeLog
+++ b/sys-kernel/kerneloops/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/kerneloops
-# 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 $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/ChangeLog,v 1.14 2011/01/30 09:29:45 ssuominen Exp $
+
+  30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> files/0.12-FLAGS.patch,
+  +files/0.12-libnotify-0.7.patch, kerneloops-0.12-r1.ebuild:
+  Fix building with x11-libs/libnotify >= 0.7. Fix missing -I and -l flags for
+  dbus-glib-1 in -FLAGS.patch.
 
 *kerneloops-0.12-r1 (07 Feb 2010)
 
diff --git a/sys-kernel/kerneloops/Manifest b/sys-kernel/kerneloops/Manifest
index 06ff8655ae09..dc9d161a751c 100644
--- a/sys-kernel/kerneloops/Manifest
+++ b/sys-kernel/kerneloops/Manifest
@@ -1,22 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 0.12-FLAGS.patch 1682 RMD160 90b17f82e9663e6d386160393a11e274220f30b6 SHA1 c78f8bf7f08335315dcf1717514323b29730b229 SHA256 552d2c48aee8bc7ec2814cf4c1a44c3cf2535fe9eb5cc0f572d3477753f6e328
+AUX 0.12-FLAGS.patch 1809 RMD160 5444ade29a6189e9d59ab2373112fd5a5892541a SHA1 1155227b038898a008b885c4c73d09cc9a50362f SHA256 84c4bb9baeedf40bcdb3c1f43409820dfe05438385e86bf9ac147382ff804104
+AUX 0.12-libnotify-0.7.patch 1572 RMD160 5d43107cd2f8c47a37760db3ade3cd6d4594fffa SHA1 3296ca9e41e7c83dfb132d10cce074eea6aaa27a SHA256 4ecaf136d47082f9128097c0296d73d68bb246ea3b785bc5064897830d9e0052
 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
-DIST kerneloops-0.11.tar.gz 62847 RMD160 fd36a3330664411505025eb8fc7bd79e468da465 SHA1 8300b1b51f23af48f7590cb3eba9df512bbe0fe5 SHA256 2f23a1a2f1b928b2ad44f13a98c704c3d7abd5e3c7157f6a8915acc74c8dcd71
 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-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
+EBUILD kerneloops-0.12-r1.ebuild 1964 RMD160 1524a57402b2c75b309f9c8bea61a5b6d921b182 SHA1 ceb26a9bb0cf472119be8aae72edf81d63e757b6 SHA256 362bf86098ace48c9b5bb60ce1dad231ccd7be9c787db5abc116c2d9aee1c0c3
+MISC ChangeLog 2880 RMD160 5bd930f28cbb76c5a18c28f5fcee080e94aea112 SHA1 d3015d2a7794820a386929084651bc04c79caaa3 SHA256 8a72b0fd81050b333f632b6bc7ec7076fde586dca80fd38b500473f2ad8d630b
 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
index 519ba22db129..0acfe206970c 100644
--- a/sys-kernel/kerneloops/files/0.12-FLAGS.patch
+++ b/sys-kernel/kerneloops/files/0.12-FLAGS.patch
@@ -1,28 +1,28 @@
-diff --git a/Makefile b/Makefile
-index 86acdf2..c2b8567 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,7 +10,7 @@ LOCALESDIR=/usr/share/locale
+diff -ur kerneloops-0.12.orig/Makefile kerneloops-0.12/Makefile
+--- kerneloops-0.12.orig/Makefile	2008-04-10 01:02:24.000000000 +0300
++++ kerneloops-0.12/Makefile	2011-01-30 11:23:39.000000000 +0200
+@@ -10,16 +10,16 @@
  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`
+-MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0`
++MY_CFLAGS := `pkg-config --cflags dbus-glib-1 libnotify gtk+-2.0`
  #
-@@ -18,8 +18,8 @@ MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0`
+ # pkg-config tends to make programs pull in a ton of libraries, not all 
  # 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`
++LIBSA := `pkg-config --libs dbus-glib-1 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
+@@ -30,11 +30,11 @@
   
  
  kerneloops:	kerneloops.o submit.o dmesg.o configfile.o kerneloops.h
diff --git a/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch b/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch
new file mode 100644
index 000000000000..4b0a32e7d832
--- /dev/null
+++ b/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch
@@ -0,0 +1,39 @@
+diff -ur kerneloops-0.12.orig/kerneloops-applet.c kerneloops-0.12/kerneloops-applet.c
+--- kerneloops-0.12.orig/kerneloops-applet.c	2008-09-13 18:27:50.000000000 +0300
++++ kerneloops-0.12/kerneloops-applet.c	2011-01-30 11:26:13.000000000 +0200
+@@ -240,8 +240,15 @@
+ 	/* if there's a notification active already, close it first */
+ 	close_notification();
+ 
+-	notify = notify_notification_new(summary, message,
+-				"/usr/share/kerneloops/icon.png", NULL);
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png");
++#else
++	notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL);
++#endif
++#else
++	notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL);
++#endif
+ 
+ 	notify_notification_set_timeout(notify, 0);
+ 	notify_notification_set_urgency(notify, NOTIFY_URGENCY_CRITICAL);
+@@ -306,8 +313,15 @@
+ 
+ 	url_to_oops[0] = 0;
+ 
+-	notify = notify_notification_new(summary, message,
+-				"/usr/share/kerneloops/icon.png", NULL);
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png");
++#else
++	notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL);
++#endif
++#else
++	notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL);
++#endif
+ 
+ 	notify_notification_set_timeout(notify, 5000);
+ 	notify_notification_set_urgency(notify, NOTIFY_URGENCY_LOW);
diff --git a/sys-kernel/kerneloops/files/makefile-standalone-0.10.patch b/sys-kernel/kerneloops/files/makefile-standalone-0.10.patch
deleted file mode 100644
index 0de58b4b285e..000000000000
--- a/sys-kernel/kerneloops/files/makefile-standalone-0.10.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- kerneloops-0.10/Makefile	2008-01-05 04:46:04.000000000 -0800
-+++ kerneloops-0.10/Makefile	2008-01-10 16:38:29.000000000 -0800
-@@ -5,6 +5,7 @@
- #
- 
- BINDIR=/usr/bin
-+SBINDIR=/usr/sbin
- LOCALESDIR=/usr/share/locale
- MANDIR=/usr/share/man/man8
- CC?=gcc
-@@ -22,6 +23,8 @@
- 
- all:	kerneloops kerneloops-applet kerneloops.1.gz
- 
-+noui:	kerneloops kerneloops.1.gz
-+
- .c.o:
- 	$(CC) $(CFLAGS) $(MY_CFLAGS) -c -o $@ $<
-  
-@@ -43,21 +46,31 @@
- dist: clean
- 	rm -rf .git .gitignore push.sh .*~  */*~ test/*dbg
- 
--
--install: kerneloops kerneloops-applet kerneloops.1.gz
--	mkdir -p $(DESTDIR)/usr/sbin/ $(DESTDIR)/etc/xdg/autostart
--	mkdir -p $(DESTDIR)/usr/share/kerneloops $(DESTDIR)/etc/dbus-1/system.d/
--	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)
--	install -m 0755 kerneloops $(DESTDIR)/usr/sbin
--	install -m 0755 kerneloops-applet $(DESTDIR)$(BINDIR)
-+install-system: kerneloops.1.gz
-+	-mkdir -p $(DESTDIR)$(MANDIR)
-+	-mkdir -p $(DESTDIR)/etc/dbus-1/system.d/
- 	install -m 0644 kerneloops.conf $(DESTDIR)/etc/kerneloops.conf
--	desktop-file-install -m 0644 --dir=$(DESTDIR)/etc/xdg/autostart/ kerneloops-applet.desktop
- 	install -m 0644 kerneloops.dbus $(DESTDIR)/etc/dbus-1/system.d/
--	install -m 0644 kerneloops.1.gz $(DESTDIR)$(MANDIR)
-+	install -m 0644 kerneloops.1.gz $(DESTDIR)$(MANDIR)/
-+	@(cd po/ && env LOCALESDIR=$(LOCALESDIR) DESTDIR=$(DESTDIR) $(MAKE) install)
-+
-+install-kerneloops: kerneloops
-+	-mkdir -p $(DESTDIR)$(SBINDIR)
-+	install -m 0755 kerneloops $(DESTDIR)$(SBINDIR)/
-+
-+install-applet: kerneloops-applet
-+	-mkdir -p $(DESTDIR)$(BINDIR)
-+	-mkdir -p $(DESTDIR)/etc/xdg/autostart
-+	-mkdir -p $(DESTDIR)/usr/share/kerneloops
-+	install -m 0755 kerneloops-applet $(DESTDIR)$(BINDIR)/
-+	desktop-file-install --mode 0644 --dir=$(DESTDIR)/etc/xdg/autostart/ kerneloops-applet.desktop
- 	install -m 0644 icon.png $(DESTDIR)/usr/share/kerneloops/icon.png
--	@(cd po/ && env LOCALESDIR=$(LOCALESDIR) DESTDIR=$(DESTDIR) $(MAKE) $@)
--	
--	
-+
-+install: install-system install-kerneloops install-applet
-+
-+install-noui: install-system install-kerneloops
-+
-+
- # This is for translators. To update your po with new strings, do :
- # svn up ; make uptrans LG=fr # or de, ru, hu, it, ...
- uptrans:
diff --git a/sys-kernel/kerneloops/kerneloops-0.10.ebuild b/sys-kernel/kerneloops/kerneloops-0.10.ebuild
deleted file mode 100644
index 83c4730c2a49..000000000000
--- a/sys-kernel/kerneloops/kerneloops-0.10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.10.ebuild,v 1.2 2008/02/13 07:54:48 opfer Exp $
-
-inherit eutils
-
-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="~x86"
-IUSE="gtk"
-
-DEPEND="net-misc/curl
-		sys-apps/dbus
-		gtk? ( x11-libs/gtk+ x11-libs/libnotify )
-		"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/makefile-standalone-0.10.patch
-}
-
-src_compile() {
-	emake kerneloops || die "Compile deamon failed"
-	if use gtk ; then
-		emake kerneloops-applet || die "Compile applet failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-system || die "Install of system failed"
-	emake DESTDIR="${D}" install-kerneloops || die "Install of deamon failed"
-	if use gtk ; then
-		emake DESTDIR="${D}" install-applet || die "Install of applet failed"
-	fi
-
-	doinitd "${FILESDIR}"/kerneloops || die "doinitd failed"
-
-}
-
-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.11.ebuild b/sys-kernel/kerneloops/kerneloops-0.11.ebuild
deleted file mode 100644
index 6a5bf6e754ae..000000000000
--- a/sys-kernel/kerneloops/kerneloops-0.11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.11.ebuild,v 1.2 2008/09/07 17:51:46 maekke Exp $
-
-inherit eutils
-
-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="gtk"
-
-DEPEND="net-misc/curl
-		sys-apps/dbus
-		gtk? ( x11-libs/gtk+ x11-libs/libnotify dev-util/desktop-file-utils )
-		"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-}
-
-src_compile() {
-	emake kerneloops || die "Compile deamon failed"
-	if use gtk ; then
-		emake kerneloops-applet || die "Compile applet failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-system || die "Install of system failed"
-	emake DESTDIR="${D}" install-kerneloops || die "Install of deamon failed"
-	if use gtk ; then
-		emake DESTDIR="${D}" install-applet || die "Install of applet failed"
-	fi
-
-	doinitd "${FILESDIR}"/kerneloops || die "doinitd failed"
-
-}
-
-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-r1.ebuild b/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild
index a549320282ba..a3866fce4901 100644
--- a/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild
+++ b/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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"
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild,v 1.2 2011/01/30 09:29:45 ssuominen Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Tool to automatically collect and submit Linux kernel crash signatures"
@@ -15,29 +14,32 @@ 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}"
+RDEPEND=">=dev-libs/dbus-glib-0.88
+	net-misc/curl
+	x11-libs/gtk+:2
+	x11-libs/libnotify
+	dev-util/desktop-file-utils"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-FLAGS.patch
+	epatch \
+		"${FILESDIR}"/${PV}-FLAGS.patch \
+		"${FILESDIR}"/${PV}-libnotify-0.7.patch
 }
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		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"
+	emake DESTDIR="${D}" install-system || die
+	emake DESTDIR="${D}" install-kerneloops || die
+	emake DESTDIR="${D}" install-applet || die
 
-	doinitd "${FILESDIR}"/kerneloops || die "doinitd failed"
+	doinitd "${FILESDIR}"/kerneloops || die
 
 	dosed 's:\(nodaemon\):\1 --file "${LOGFILE}":g' /etc/init.d/${PN}
 
diff --git a/sys-kernel/kerneloops/kerneloops-0.12.ebuild b/sys-kernel/kerneloops/kerneloops-0.12.ebuild
deleted file mode 100644
index d9913586657c..000000000000
--- a/sys-kernel/kerneloops/kerneloops-0.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.2 2010/02/07 19:31:52 jlec Exp $
-
-inherit eutils
-
-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_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-}
-
-src_compile() {
-	emake kerneloops || die "Compile deamon failed"
-	emake kerneloops-applet || die "Compile applet failed"
-}
-
-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"
-
-}
-
-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."
-}