Fix QA warnings: poor programming practices, bug #257281

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

4 files changed, 118 insertions, 2 deletions

diff --git a/dev-libs/libgamin/ChangeLog b/dev-libs/libgamin/ChangeLog
index ca36eae2c281..2f3cec2df80d 100644
--- a/dev-libs/libgamin/ChangeLog
+++ b/dev-libs/libgamin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libgamin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.13 2009/02/07 01:30:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.14 2009/02/15 23:15:12 eva Exp $
+
+*libgamin-0.1.10-r2 (15 Feb 2009)
+
+  15 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/libgamin-0.1.10-compilewarnings.patch, +libgamin-0.1.10-r2.ebuild:
+  Fix QA warnings: poor programming practices, bug #257281
 
   07 Feb 2009; Jeroen Roovers <jer@gentoo.org> libgamin-0.1.10-r1.ebuild:
   Stable for HPPA (bug #252350).
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index a6287113881c..a89b2b83b287 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gamin-0.1.9-freebsd.patch 16238 RMD160 814d3ea14e9de819bf48bed005fb3d72af0a4ec4 SHA1 44206ae9860edd463d55f85bedb0ad80e1bce562 SHA256 c6986a8f0b2152e873cf10a3475330c149002755b9f4842bf82117f80cc325a0
+AUX libgamin-0.1.10-compilewarnings.patch 526 RMD160 b460c5b724a36934c5e4a411a3d5e6d5a8f820ef SHA1 8358f05948018bfd46b752f76006f5272f5f9385 SHA256 dfca2bee08ba14c873a6bcd732359dd7e3a9372d6d9fb82378194d7a73a30e68
 AUX libgamin-0.1.10-noinst-lib.patch 2207 RMD160 f0d2479f5aec3ef8852a36214c168ef560de3594 SHA1 544895f7345413c5314b4d5892492e7b27c8eb6b SHA256 e19ede71d259fbe5888c06635441365a48687034b24c5f15edd808a7cbd9cdc7
 DIST gamin-0.1.10.tar.gz 653392 RMD160 fb6ba5ec2d2f49afacf10dda4095f02f5930d686 SHA1 f4c6b9fe87757552ef58fef4abef9e42cd3142ac SHA256 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1
 EBUILD libgamin-0.1.10-r1.ebuild 2051 RMD160 9db9008325556b059fa2132d17cb85b21058fa23 SHA1 609a656567828a0f768a3217fdd2975362d21cfb SHA256 e9bcb693b76d9748e777f454c0213ea6cd18aa38af32b16d5dcf7044885b75a8
-MISC ChangeLog 1945 RMD160 4552c699981e2bc7357a4b7072c2924134a00b08 SHA1 7a35627cf44f953ab40ec082cab579391aec1614 SHA256 95d7cee7c01fe58ec49427ade447ba7c62d0fa366335f24d9819a4231a0a78a0
+EBUILD libgamin-0.1.10-r2.ebuild 2087 RMD160 f3e7218fdff733ce614439e9351a770bcb392ae1 SHA1 eeaaef888671ebf2f4d491b9ecceb486455c6362 SHA256 e388801d474fdb5ce2caf0d22fe867e712fa3752f0f6a52331cb4edf3039e074
+MISC ChangeLog 2170 RMD160 3beefd29c6b5c40db397067973acea838962c836 SHA1 290be93f8808bf720b9d6cc1084ffe792765f759 SHA256 b21436a7471c6b2bb0a29cd42afed84b5a89dbb30ab0bcf391a50631d944822d
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmYogUACgkQ1fmVwcYIWAb3sQCdEBPxNTLcwuu3R7Hz0EHkOPHY
+IMEAnjtBY9dEKmJUo2c+XaPbaauLzYBa
+=/0fI
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch b/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch
new file mode 100644
index 000000000000..d3e0931391a7
--- /dev/null
+++ b/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch
@@ -0,0 +1,22 @@
+--- gamin-0.1.9/lib/gam_error.h.1	2007-08-15 01:09:13.000000000 +0200
++++ gamin-0.1.9/lib/gam_error.h	2007-08-15 01:09:27.000000000 +0200
+@@ -47,6 +47,9 @@
+ 
+ int gam_errno(void);
+ 
++void	gam_error_init(void);
++void	gam_error_check(void);
++
+ #ifdef GAM_DEBUG_ENABLED
+ 
+ #ifdef GAMIN_DEBUG_API
+@@ -70,9 +73,6 @@
+                   const char* format, ...);
+ #define GAM_DEBUG if (gam_debug_active) gam_debug
+ 
+-void	gam_error_init(void);
+-void	gam_error_check(void);
+-
+ #else
+ /*
+  * no debug, redefine the macro empty content
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
new file mode 100644
index 000000000000..34e491b5fefa
--- /dev/null
+++ b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.1 2009/02/15 23:15:12 eva Exp $
+
+EAPI="2"
+
+inherit autotools eutils flag-o-matic libtool python
+
+MY_PN=${PN//lib/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Library providing the FAM File Alteration Monitor API"
+HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
+SRC_URI="http://www.gnome.org/~veillard/${MY_PN}/sources/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug kernel_linux python"
+
+RESTRICT="test" # need gam-server
+
+RDEPEND="python? ( virtual/python )
+	!app-admin/fam
+	!<app-admin/gamin-0.1.10"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Fix QA warnings, bug #257281, upstream #466791
+	epatch "${FILESDIR}/${P}-compilewarnings.patch"
+
+	# Fix compile warnings; bug #188923
+	epatch "${FILESDIR}/${MY_PN}-0.1.9-freebsd.patch"
+
+	# Fix collision problem due to intermediate library, upstream bug #530635
+	epatch "${FILESDIR}/${P}-noinst-lib.patch"
+
+	# autoconf is required as the user-cflags patch modifies configure.in
+	# however, elibtoolize is also required, so when the above patch is
+	# removed, replace the following call with a call to elibtoolize
+	eautoreconf
+
+	# disable pyc compiling
+	mv "${S}"/py-compile "${S}"/py-compile.orig
+	ln -s $(type -P true) "${S}"/py-compile
+}
+
+src_configure() {
+	econf --disable-debug \
+		--disable-server \
+		$(use_enable kernel_linux inotify) \
+		$(use_enable debug debug-api) \
+		$(use_with python)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installation failed"
+
+	dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt || die "dodoc failed"
+	dohtml doc/* || die "dohtml failed"
+}
+
+pkg_postinst() {
+	if use python; then
+		python_version
+		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages
+}