--- x11-misc/cairo-dock/cairo-dock-2.0.8.2.ebuild	2009-08-30 20:26:47.000000000 +0200
+++ x11-misc/cairo-dock/cairo-dock-2.1.1.2.ebuild	2009-11-30 21:02:03.000000000 +0100
@@ -4,16 +4,19 @@
 
 EAPI="2"
 
-inherit autotools eutils
+inherit eutils
+
+MY_P=${P%.*}-${P##*.}
 
 DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
 HOMEPAGE="http://www.cairo-dock.org"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+#SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.bz2"
+SRC_URI="http://launchpad.net/cairo-dock-core/2.1/2.1.1/+download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="glitz xcomposite"
+IUSE="glitz nls xcomposite"
 
 RDEPEND="dev-libs/dbus-glib
 	dev-libs/glib:2
@@ -29,25 +32,25 @@
 		x11-libs/libXcomposite
 		x11-libs/libXinerama
 		x11-libs/libXtst
-	)
-"
+	)"
+
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
-#FIXME: Maybe a sed expression which solves the problem
-# would be better ?
-src_prepare() {
-	epatch "${FILESDIR}/${P}-safe-cflags.patch"
+S="${WORKDIR}"/${MY_P}
 
-	# Fix infinite loop while processing po/Makefile.in
-	# and needed for patch above.
-	eautoreconf
+src_prepare() {
+	# Hardcoded CFLAGS are bad
+	sed -e '/-O3\\$/d;/-g -ggdb\\$/d' -i src/Makefile.in || \
+		die "sedding Makefile.in failed"
+	# Fix POTFILES.in
+	epatch "${FILESDIR}"/${P}-POTFILES.patch
 }
 
 src_configure() {
-	econf $(use_enable glitz) $(use_enable xcomposite xextend)
+	econf $(use_enable glitz) $(use_enable xcomposite xextend) $(use_enable nls)
 }
 
 src_install() {