Fix bug #287746, compile-warnings support was automagic, which forced -Werror cflag to be used (and compilation to fail). Fix some QA

Package-Manager: portage-2.2_rc43/cvs/Linux x86_64

4 files changed, 54 insertions, 25 deletions

diff --git a/net-misc/drivel/ChangeLog b/net-misc/drivel/ChangeLog
index 9f5ec3834413..331002a30b3e 100644
--- a/net-misc/drivel/ChangeLog
+++ b/net-misc/drivel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/drivel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/drivel/ChangeLog,v 1.34 2009/10/05 18:55:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/drivel/ChangeLog,v 1.35 2009/10/06 09:54:11 mrpouet Exp $
+
+  06 Oct 2009; Romain Perier <mrpouet@gentoo.org>
+  drivel-3.0.0.ebuild, +files/drivel-3.0.0-compile-warnings.patch:
+  Fix bug #287746, compile-warnings support was automagic, which forced
+  -Werror cflag to be used (and compilation to fail). Fix some QA.
 
   05 Oct 2009; Hans de Graaff <graaff@gentoo.org> drivel-3.0.0.ebuild:
   Do not error out on warnings, this should fix the build as reported in
diff --git a/net-misc/drivel/Manifest b/net-misc/drivel/Manifest
index ff58a33dd6a5..db9a03f435f4 100644
--- a/net-misc/drivel/Manifest
+++ b/net-misc/drivel/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX drivel-3.0.0-compile-warnings.patch 883 RMD160 d8238a17fbec9d4962ebdf669abeca6f9b078287 SHA1 0d01c9acf11f13bb2c5e66d394ccf66280ab9cc0 SHA256 43427b963f7b83823b1653a508fe96fa5a651109a4c15cf54de5bc285f3872f6
 DIST drivel-2.0.3.tar.bz2 648882 RMD160 1f7475472d720ebc80b75345fad5ef0eaa15e6de SHA1 33f684e6fc9ea710f00a74e14c99800bd3217586 SHA256 dcfb09c493a90c01f51dd6d559f31db3202118e56a55dcb97abd5a1d8396549c
 DIST drivel-2.0.4.tar.bz2 684304 RMD160 28221060427d1a2cf7915f592b1ca9f01a33e145 SHA1 8524d274c72264414c43d42ad4236edc501326d6 SHA256 f5f4ea331fd002fc444051ba1fee0460d78179153bcb6060c417e2ba3f6bfebd
 DIST drivel-3.0.0.tar.bz2 690633 RMD160 f07ac8cfc8388a89d704a576678d0fbbb69efcb6 SHA1 0d3926edbd4eb93f2974cfd165a6bd5c61225fc7 SHA256 7e499e8bc1f58e94f27980f91e54d9934850a0bfbb514317adea91b4f123f404
 EBUILD drivel-2.0.3.ebuild 1150 RMD160 5eb7566fa636c8c806fc965486952a1975adff84 SHA1 b1c307dc3fa05186c4e91929ea0a32682ed1c2a2 SHA256 31633c7e2c4b40ce9545561b8b1c81fbc6e99ab0bf047aa27973be04a6592abc
 EBUILD drivel-2.0.4.ebuild 1159 RMD160 2a90d3d9cd69922950f18f94394a502e743480c4 SHA1 62097e95b1ce20493031a8a57a6bfaa8b3c2c266 SHA256 a4cb10d87ccd36aef12d53fd5eac8f40f7888f60fe4be8a0fd15e9ed76ff5ff0
-EBUILD drivel-3.0.0.ebuild 1169 RMD160 8a7c6d573f98153376cb0a360fc97b7809e9881f SHA1 fc62d4f8dd6a6a7c03eefb8e3b3845f07dffaa58 SHA256 39f5d723ea55932d4ea333d693df04a329257ca8b7d0546e7bc1ad460bb73d42
-MISC ChangeLog 5023 RMD160 24f05ec88a92e77fbc0be5ae9927acfc98cb41df SHA1 c45d2741d840888ee0246b7aa753fa7b2b33f6b2 SHA256 1d580c4d13cc69c5f8e625d79de0868724ca461d7ca6acdf40cc0a52a576c4bd
+EBUILD drivel-3.0.0.ebuild 1370 RMD160 5ec3b661445db77023ebaad8a75f3c1261d8bc11 SHA1 e6a5cc2017628f4193d9db25cf5e76646ed23f65 SHA256 5d012574c161359f8d544ff0afaafd94e7381db198fa9eb8fd5163cffa2e0184
+MISC ChangeLog 5281 RMD160 0e97d01ccc65778bbafb5fc3f0ef74aaf288a0d9 SHA1 6836f84cb515e1797886969aeaaa873dae038dd0 SHA256 408e76f6ae8464ac6ae9bb24746582a83603b027894a3218e9b8e6ad762ba214
 MISC metadata.xml 260 RMD160 29112e383282a485c96080656a47245995363190 SHA1 41599cdbf4302b9bd43bb456dac752ce818cf428 SHA256 31a2e4d2f4f5354205d8c2a028ad9b08978bab4717e8a538b01dd768ba9ecb2c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrKQUQACgkQVYU2Ai8K93fWuwCfW2v5Jb9j8D5HO47+jczSpTVj
-Yz4An3+ZzDohKq683Ht8fwr3IWP7nWCV
-=PYKd
------END PGP SIGNATURE-----
diff --git a/net-misc/drivel/drivel-3.0.0.ebuild b/net-misc/drivel/drivel-3.0.0.ebuild
index bfab44d92633..d161e2958d4f 100644
--- a/net-misc/drivel/drivel-3.0.0.ebuild
+++ b/net-misc/drivel/drivel-3.0.0.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/drivel/drivel-3.0.0.ebuild,v 1.2 2009/10/05 18:55:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/drivel/drivel-3.0.0.ebuild,v 1.3 2009/10/06 09:54:11 mrpouet Exp $
 
-inherit gnome2
+EAPI="2"
+
+inherit autotools eutils gnome2
 
 DESCRIPTION="Drivel is a desktop blogger with support for LiveJournal, Blogger,
 MoveableType, Wordpress and more."
@@ -29,15 +31,21 @@ DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.3.2
 	>=dev-util/intltool-0.21
 	>=app-text/scrollkeeper-0.3.5"
-
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-G2CONF="${G2CONF} \
-	`use_with spell gtkspell` \
-	`use_with dbus` \
-	--disable-mime-update \
-	--disable-desktop-update \
-	--disable-error-on-warning \
-	--localstatedir=${D}/var"
-
-USE_DESTDIR="1"
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with spell gtkspell)
+		$(use_with dbus)
+		--disable-mime-update
+		--disable-desktop-update
+		--disable-error-on-warning
+		--disable-compile-warnings
+		--localstatedir=${D}/var"
+}
+src_prepare() {
+	epatch "${FILESDIR}/${P}-compile-warnings.patch"
+
+	intltoolize --automake --copy --force || die "intltoolize failed"
+	eautoreconf
+}
diff --git a/net-misc/drivel/files/drivel-3.0.0-compile-warnings.patch b/net-misc/drivel/files/drivel-3.0.0-compile-warnings.patch
new file mode 100644
index 000000000000..0d691241dc12
--- /dev/null
+++ b/net-misc/drivel/files/drivel-3.0.0-compile-warnings.patch
@@ -0,0 +1,25 @@
+From 0aad8e2d49567c78f0c0bd43ecc2547a7a9f3e7e Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Tue, 6 Oct 2009 11:41:11 +0200
+Subject: [PATCH] Fix compile-warnings automagic support, which caused compilation to fail (-Werror)
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4d83014..8500f3b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -238,7 +238,7 @@ set_compile_warnings=no
+ AC_ARG_ENABLE(compile-warnings,
+               [  --enable-compile-warnings
+                           Enable verbose compiler warnings],
+-              set_compile_warnings=yes)
++              set_compile_warnings=$enableval, set_compile_warnings=yes)
+ 
+ if test "$GCC" = "yes" -a "$set_compile_warnings" != "no"; then
+         WARN_CFLAGS="$WARN_CFLAGS -Wcast-align -Wsign-compare \
+-- 
+1.6.5.rc2
+