- Added new version of Calibre,

- Added patch for bubblemon dockapp (bug#310399, upgrade GTK to 2.18), removed
  some old patches
- Added newest version of newsbeuter (+ stfl lib)

x11-misc/bubblemon/bubblemon-1.46-r10.ebuild

@@ -1,35 +1,43 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-1.46.ebuild,v 1.7 2006/02/07 21:11:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild,v 1.8 2010/01/10 18:39:54 fauli Exp $
 
 inherit eutils
 
 DESCRIPTION="A fun monitoring applet for your desktop, complete with swimming duck"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
 S=${WORKDIR}/${PN}-dockapp-${PV}
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.gz"
-DEPEND="virtual/libc
-	=x11-libs/gtk+-1.2*
-	>=sys-apps/sed-4"
 
-src_unpack(){
+src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/bubblemon-1.46-correct_mem-swap_values.patch || die "epatch failed"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gtk.patch
+	epatch  "${FILESDIR}"/${P}-no_display.patch
 }
-src_compile() {
-	sed -i "s/CFLAGS = -O3/CFLAGS = ${CFLAGS}/" Makefile
-#	sed -i "s/# EXTRA += -DUPSIDE_DOWN_DUCK/EXTRA += -DUPSIDE_DOWN_DUCK/" Makefile
 
-	make || die
+src_compile() {
+	emake GENTOO_CFLAGS="${CFLAGS}" || die "emake failed."
 }
 
 src_install () {
-	into /usr
 	dobin bubblemon
-	dodoc ChangeLog README doc/* misc/*
+
+	dodoc ChangeLog README doc/Xdefaults.sample
+
+	insinto /usr/share/${PN}
+	doins misc/{*.xcf,*.wav}
+
+	exeinto /usr/share/${PN}
+	doexe misc/wakwak.sh
 }