- 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)

dev-libs/stfl/Manifest

@@ -0,0 +1,3 @@
+AUX stfl-0.21-multilib.patch 1936 RMD160 fce9de74ac0cab5abe0e9b2d53c82cad602a5be1 SHA1 1ae240823806120b94c5cda5ba96b57e289bd730 SHA256 905260dbd13b4ce374d95ced9ea5d443fc44de0f14c0f1140fc8c7cead6c1f06
+DIST stfl-0.21.tar.gz 41093 RMD160 d8b56cc97b4d76adba8034ce9bbae631e6e9d17e SHA1 0313eafa1fe4dcfea1f2edd34d453baaa46df277 SHA256 bf0ead0a66b635602222bc9089414b99f99081b956c92baf77699d283bcc88eb
+EBUILD stfl-0.21.ebuild 1683 RMD160 e628dc7b4e910438e695679368a13bec7d4d2035 SHA1 e62cbfdb730f0d544474791983fbd485affe2640 SHA256 1d7047e76ae71b740285b6b22f8570860bf6634bf750f531cd874cbfb3869219

dev-libs/stfl/files/stfl-0.21-multilib.patch

@@ -0,0 +1,39 @@
+diff -ur stfl-0.21.orig/Makefile stfl-0.21/Makefile
+--- stfl-0.21.orig/Makefile	2009-06-19 10:30:52.000000000 -0700
++++ stfl-0.21/Makefile	2009-12-23 15:12:34.986593069 -0800
+@@ -46,7 +46,7 @@
+ 	rm -f widgets/*.o spl/mod_stfl.so spl/example.db
+ 	cd perl5 && perl Makefile.PL && make clean && rm -f Makefile.old
+ 	rm -f perl5/stfl_wrap.c perl5/stfl.pm perl5/build_ok
+-	rm -f python/stfl.py python/stfl.pyc python/_stfl.so 
++	rm -f python/stfl.py python/_stfl.so 
+ 	rm -f python/stfl_wrap.c python/stfl_wrap.o
+ 	rm -f ruby/Makefile ruby/stfl_wrap.c ruby/stfl_wrap.o
+ 	rm -f ruby/stfl.so ruby/build_ok Makefile.deps_new
+diff -ur stfl-0.21.orig/python/Makefile.snippet stfl-0.21/python/Makefile.snippet
+--- stfl-0.21.orig/python/Makefile.snippet	2009-06-18 01:27:16.000000000 -0700
++++ stfl-0.21/python/Makefile.snippet	2009-12-23 15:14:54.237606055 -0800
+@@ -21,20 +21,17 @@
+ PYTHON_VERSION = $(shell python -V 2>&1 | cut -f2 -d' ' | cut -f1-2 -d'.')
+ PYTHON_SITEARCH = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+ 
+-all: python/_stfl.so python/stfl.py python/stfl.pyc
++all: python/_stfl.so python/stfl.py
+ 
+ install: install_python
+ 
+-python/_stfl.so python/stfl.py python/stfl.pyc: libstfl.a stfl.h python/stfl.i swig/*.i
++python/_stfl.so python/stfl.py: libstfl.a stfl.h python/stfl.i swig/*.i
+ 	cd python && swig -python -threads stfl.i
+ 	gcc -shared -pthread -fPIC python/stfl_wrap.c -I/usr/include/python$(PYTHON_VERSION) \
+ 		-I. libstfl.a -lncursesw -o python/_stfl.so
+-	cd python && python -c 'import stfl'
+ 
+-install_python: python/_stfl.so python/stfl.py python/stfl.pyc
+-	mkdir -p $(DESTDIR)$(PYTHON_SITEARCH)/
++install_python: python/_stfl.so python/stfl.py
+ 	mkdir -p $(DESTDIR)$(PYTHON_SITEARCH)/lib-dynload/
+ 	cp python/_stfl.so $(DESTDIR)$(PYTHON_SITEARCH)/lib-dynload/
+-	cp python/stfl.pyc $(DESTDIR)$(PYTHON_SITEARCH)/
+ 	cp python/stfl.py $(DESTDIR)$(PYTHON_SITEARCH)/
+ 

dev-libs/stfl/stfl-0.21.ebuild

@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit eutils multilib perl-module python toolchain-funcs
+
+DESCRIPTION="A library which implements a curses-based widget set for text terminals"
+HOMEPAGE="http://www.clifford.at/stfl/"
+SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+IUSE="examples perl python ruby"
+
+COMMON_DEPEND="sys-libs/ncurses[unicode]
+	perl? ( dev-lang/perl )
+	ruby? ( dev-lang/ruby )
+	python? ( dev-lang/python )"
+
+DEPEND="${COMMON_DEPEND}
+	perl? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e "s!-Os -ggdb!!" \
+		-e "s!^\(all:.*\) example!\1!" \
+		Makefile
+
+	epatch "${FILESDIR}/${P}-multilib.patch"
+
+	if ! use perl; then
+		echo "FOUND_PERL5=0" >>Makefile.cfg
+	fi
+
+	if ! use ruby; then
+		echo "FOUND_RUBY=0" >>Makefile.cfg
+	fi
+
+	if ! use python; then
+		echo "FOUND_PYTHON=0" >>Makefile.cfg
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "make failed"
+}
+
+src_install() {
+	python_version
+	emake prefix="/usr" DESTDIR="${D}" libdir="$(get_libdir)" install || die "make install failed"
+
+	dodoc README
+
+	local exdir="/usr/share/doc/${PF}/examples"
+	if use examples; then
+		insinto ${exdir}
+		doins example.{c,stfl}
+		insinto  ${exdir}/python
+		doins python/example.py
+		if use perl; then
+			insinto ${exdir}/perl
+			doins perl5/example.pl
+		fi
+		if use ruby; then
+			insinto ${exdir}/ruby
+			doins ruby/example.rb
+		fi
+	fi
+
+	fixlocalpod
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/stfl.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}