--- x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.0.8.2.ebuild	2009-08-29 22:56:12.000000000 +0200
+++ x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.1.1.2.ebuild	2009-12-01 09:23:43.000000000 +0100
@@ -4,17 +4,19 @@
 
 EAPI="2"
 
-inherit eutils autotools
+inherit eutils
+
+MY_P=${P%.*}-${P##*.}
 
 DESCRIPTION="Official plugins for cairo-dock"
 HOMEPAGE="http://www.cairo-dock.org"
-SRC_URI="mirror://berlios/${PN/-plugins}/${P}.tar.bz2
-	http://dev.gentoo.org/~mrpouet/pub/patches/${PN}-2.0.8-clean-up-cflags.patch.lzma"
+#SRC_URI="mirror://berlios/${PN/-plugins}/${P}.tar.bz2"
+SRC_URI="http://launchpad.net/cairo-dock-plug-ins/2.1/2.1.1/+download/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="alsa compiz exif gio gmenu gnome mail nvidia powermanager rhythmbox terminal tomboy webkit wifi xfce xgamma xklavier"
+IUSE="alsa compiz dnd2share exif gio gmenu gnome mail nls powermanager rhythmbox scoobydo terminal tomboy webkit wifi xfce xgamma xklavier"
 
 RDEPEND="~x11-misc/cairo-dock-${PV}
 	alsa? ( media-libs/alsa-lib )
@@ -30,6 +32,16 @@
 	sys-devel/gettext
 	dev-util/pkgconfig"
 
+CD_PLUGINS="Animated-icons Cairo-Penguin Clipper Dbus GMenu Network-Monitor Scooby-Do
+	System-Monitor Toons Xgamma alsaMixer clock compiz-icon desklet-rendering
+	dialog-rendering dnd2share dock-rendering drop-indicator dustbin
+	gnome-integration-old gnome-integration icon-effect illusion keyboard-indicator
+	logout mail motion-blur musicPlayer netspeed powermanager quick-browser shortcuts
+	show-mouse showDesklets showDesktop slider stack switcher systray terminal tomboy
+	weather weblets wifi xfce-integration"
+
+S="${WORKDIR}"/${MY_P}
+
 pkg_setup() {
 	if use gio; then
 		if ! use gmenu; then
@@ -39,11 +51,19 @@
 }
 
 src_prepare() {
-	# Fix infinite loop in po/
-	# (What's are these buggy autotools ?)
-	eautoreconf
-
-	epatch "${WORKDIR}/${PN}-2.0.8-clean-up-cflags.patch"
+	local cd_plugin
+	# hardcoded CFLAGS are bad
+	for cd_plugin in ${CD_PLUGINS}; do
+		# reverse Makefile.in
+		sed -e '1!G;h;$!d' -i ${cd_plugin}/src/Makefile.in || die
+		# remove -O3 and trailing backslash of following line (which is
+		# previous in original file)
+		sed -e '/-O3$/{N;s:.*-O3\n::;s:\\$::}' \
+			-i ${cd_plugin}/src/Makefile.in ||	die
+		# reverse Makefile.in again
+		sed -e '1!G;h;$!d' -i ${cd_plugin}/src/Makefile.in || die
+	done
+	epatch "${FILESDIR}"/${P}-POTFILES.patch
 }
 
 src_configure() {
@@ -51,15 +71,17 @@
 		--disable-old-gnome-integration       \
 		$(use_enable alsa  alsa-mixer)        \
 		$(use_enable compiz compiz-icon)      \
+		$(use_enable dnd2share)               \
 		$(use_enable exif)                    \
 		$(use_enable gio gio-in-gmenu)        \
 		$(use_enable gio gmenu)               \
 		$(use_enable gmenu)                   \
 		$(use_enable gnome gnome-integration) \
 		$(use_enable mail)                    \
-		$(use_enable nvidia)                  \
+		$(use_enable nls)                     \
 		$(use_enable powermanager)            \
-		$(use_enable rhythmbox)               \
+		$(use_enable rhythmbox musicplayer)   \
+		$(use_enable scoobydo scooby-do)      \
 		$(use_enable terminal)                \
 		$(use_enable tomboy)                  \
 		$(use_enable webkit weblets)          \
@@ -72,3 +94,8 @@
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 }
+
+pkg_postinst() {
+	elog "The applets 'Cpusage', 'Ram-meter' and 'Nvidia' are merged now into"
+	elog "'System-Monitor' applet."
+}