Version bump, and fix a bug where CFLAGS were being ignored (Arfrever Frehtes Taifersar Arahesis, #178266). x86-fbsd keywords dropped as fbsd patch no longer applies.

Package-Manager: portage-2.1.3.3

5 files changed, 184 insertions, 5 deletions

diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog
index b4bcd50b4bc1..0e250fb62dbb 100644
--- a/app-admin/gamin/ChangeLog
+++ b/app-admin/gamin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/gamin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.66 2007/07/12 18:28:39 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.67 2007/08/07 15:36:23 dsd Exp $
+
+*gamin-0.1.9 (07 Aug 2007)
+
+  07 Aug 2007; Daniel Drake <dsd@gentoo.org>
+  +files/gamin-0.1.9-user-cflags.patch, +gamin-0.1.9.ebuild:
+  Version bump, and fix a bug where CFLAGS were being ignored (Arfrever
+  Frehtes Taifersar Arahesis, #178266). x86-fbsd keywords dropped as fbsd
+  patch no longer applies.
 
   12 Jul 2007; Samuli Suominen <drac@gentoo.org> metadata.xml:
   Change metadata from azarah to gnome, kde, and xfce.
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 048cee7ec0fa..81599e6113e0 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,6 +1,11 @@
+AUX gamin-0.1.9-user-cflags.patch 2897 RMD160 ce3e55f792ce260832166c6a59570c47150ff75d SHA1 e338dc5e2e60ab4101b2fa22994c43564a1c0f6b SHA256 21229e95a229e56808be239469dc75fea6ff5b42f0e59a2d935186fdfeeb9e0f
+MD5 01bf1092ff9a6893b266c9c4c53dacf9 files/gamin-0.1.9-user-cflags.patch 2897
+RMD160 ce3e55f792ce260832166c6a59570c47150ff75d files/gamin-0.1.9-user-cflags.patch 2897
+SHA256 21229e95a229e56808be239469dc75fea6ff5b42f0e59a2d935186fdfeeb9e0f files/gamin-0.1.9-user-cflags.patch 2897
 DIST gamin-0.1.7-freebsd.patch.bz2 5217 RMD160 22ee7ccac4cca87188bf299404186d3c5ea08475 SHA1 31ca1fdf8e21f9a0ac3a98b7865e3ab0d3c6c471 SHA256 8c77200b1fac6f1a65819a38ab54767f8a25ffbe990cde5f500eec040d815fbf
 DIST gamin-0.1.7.tar.gz 542061 RMD160 440b6afc682806b33aa275e3b8a593dc7e3f93de SHA1 bde971a10a3510626d501db3a746370c8931612a SHA256 8272c64356e1310353f2411b2cabd211468edbf8ce312d58aeef55889e79361a
 DIST gamin-0.1.8.tar.gz 564530 RMD160 3ad723480f840d67daedb9bc10a93b48ba34bc47 SHA1 5dacc8c452d4aa5dc81eb6bee4a4bdc52fbfbe36 SHA256 be22f69b4797db510f4270ff0e228dd027e99e561ac5f5d38be595be7e82d203
+DIST gamin-0.1.9.tar.gz 645429 RMD160 e376f551f7417dd04692e7463b46b9a193d48366 SHA1 f8f8a4f0701a2c9a69634a60a135298db90d7779 SHA256 19e2c620e84da678b629d4acb07d93f47a2e5075982892646f77520bb277f239
 EBUILD gamin-0.1.7.ebuild 1442 RMD160 c9f56d56c5013be67027a19c3b1827e04d34f5f2 SHA1 13a36229dc9ac7c53c394e3e24273f381ddbe981 SHA256 d9b05a7878ff578a794e3d019f4c64ed4a889085dc20d51335d6464566e23fe0
 MD5 40d14454e9069d8ba72e17ab7e23b325 gamin-0.1.7.ebuild 1442
 RMD160 c9f56d56c5013be67027a19c3b1827e04d34f5f2 gamin-0.1.7.ebuild 1442
@@ -9,10 +14,14 @@ EBUILD gamin-0.1.8.ebuild 1226 RMD160 2d1f3aef0ccf37294d738ad2a5fbdebd5ecb0bd4 S
 MD5 e6bc33d0d7cbb0d374a3ee9952f19a6f gamin-0.1.8.ebuild 1226
 RMD160 2d1f3aef0ccf37294d738ad2a5fbdebd5ecb0bd4 gamin-0.1.8.ebuild 1226
 SHA256 184415ddd69b4972c6d34b9fe64e88523b43aab3ab97d113c7734d4db98295bc gamin-0.1.8.ebuild 1226
-MISC ChangeLog 9494 RMD160 8f2a4ec11bcf4d83c97fd3fd2a00c310156f39ad SHA1 0d9f9227f9e6bf9d50505a359a4c1507efbee603 SHA256 99217d6cd5bdc08106db00cd84193e9c1053fcb9965504af9ccec7d24f647b50
-MD5 ff7698ce86ac28c15cb63e92368de628 ChangeLog 9494
-RMD160 8f2a4ec11bcf4d83c97fd3fd2a00c310156f39ad ChangeLog 9494
-SHA256 99217d6cd5bdc08106db00cd84193e9c1053fcb9965504af9ccec7d24f647b50 ChangeLog 9494
+EBUILD gamin-0.1.9.ebuild 1302 RMD160 353c5eb015e710c4fac9cb6c14572bf6f04a0264 SHA1 e0899f12ca74420d6afdce5673965b04753934ad SHA256 6039a338ce260b79b1ad76025d1fde306c54a8995bf0d29c4242ab8324b2dcec
+MD5 4883851ea1816c50affd5134c662810b gamin-0.1.9.ebuild 1302
+RMD160 353c5eb015e710c4fac9cb6c14572bf6f04a0264 gamin-0.1.9.ebuild 1302
+SHA256 6039a338ce260b79b1ad76025d1fde306c54a8995bf0d29c4242ab8324b2dcec gamin-0.1.9.ebuild 1302
+MISC ChangeLog 9801 RMD160 778ef8e071dad0a509dd96c5d89ed7e83940fe71 SHA1 989eca1f748a577b148b1b4bbb2c17eefe3a85a5 SHA256 76d404f7b2076b112e8f899e738356ed5f0e0b1c1f8992117bacf8e087314cc7
+MD5 3776a8d4a619ae96fceec4c9fa6c532f ChangeLog 9801
+RMD160 778ef8e071dad0a509dd96c5d89ed7e83940fe71 ChangeLog 9801
+SHA256 76d404f7b2076b112e8f899e738356ed5f0e0b1c1f8992117bacf8e087314cc7 ChangeLog 9801
 MISC metadata.xml 193 RMD160 d229eaaf3f5d3937df3a8242fbb874afee3afeff SHA1 c11375432387dea6f6f9b80baf1490c17f9674ae SHA256 4143c03933b7210719f44d20a67303de568d2b5a064ab0903720ce628ce4afa2
 MD5 693a5239bdba8c5a7acb6013e7562ca7 metadata.xml 193
 RMD160 d229eaaf3f5d3937df3a8242fbb874afee3afeff metadata.xml 193
@@ -23,3 +32,6 @@ SHA256 65c5ef16d64495211c6d24b345c15af401df9ad0c4baad29eb3b2095421f6ef9 files/di
 MD5 02be5e02e5b766fb11a75eaa24df26f9 files/digest-gamin-0.1.8 497
 RMD160 cb691a43dbc12abdf906dcf954b858a93eb61732 files/digest-gamin-0.1.8 497
 SHA256 3a8802928bc0baff287ef9e512ffbac9bcb1d9b8dde31e665764fa268a48af3a files/digest-gamin-0.1.8 497
+MD5 7bba52d5aee1e5972e4a75ba324066f5 files/digest-gamin-0.1.9 235
+RMD160 ff0f48f018ac8669122aa5bbc7a5a655df9cfba7 files/digest-gamin-0.1.9 235
+SHA256 5eaa65ebbd14bad8a33c05ed98f0ce7d2b5bb0474c123a1a0a3eb80460e472b6 files/digest-gamin-0.1.9 235
diff --git a/app-admin/gamin/files/digest-gamin-0.1.9 b/app-admin/gamin/files/digest-gamin-0.1.9
new file mode 100644
index 000000000000..c4e502b2eff1
--- /dev/null
+++ b/app-admin/gamin/files/digest-gamin-0.1.9
@@ -0,0 +1,3 @@
+MD5 2d3a6a70df090ed923238e381e6c2982 gamin-0.1.9.tar.gz 645429
+RMD160 e376f551f7417dd04692e7463b46b9a193d48366 gamin-0.1.9.tar.gz 645429
+SHA256 19e2c620e84da678b629d4acb07d93f47a2e5075982892646f77520bb277f239 gamin-0.1.9.tar.gz 645429
diff --git a/app-admin/gamin/files/gamin-0.1.9-user-cflags.patch b/app-admin/gamin/files/gamin-0.1.9-user-cflags.patch
new file mode 100644
index 000000000000..f4020bfd756b
--- /dev/null
+++ b/app-admin/gamin/files/gamin-0.1.9-user-cflags.patch
@@ -0,0 +1,107 @@
+
+From: Daniel Drake <dsd@gentoo.org>
+
+gamin ignores user-supplied CFLAGS.
+http://bugzilla.gnome.org/show_bug.cgi?id=450262
+https://bugs.gentoo.org/show_bug.cgi?id=178266
+
+Index: configure.in
+===================================================================
+--- configure.in	(revision 325)
++++ configure.in	(working copy)
+@@ -1,13 +1,12 @@
+ dnl Process this file with autoconf to produce a configure script.
+-
+-# get any external flags setting before we start playing with the CFLAGS variable
+-ENV_CFLAGS=$CFLAGS
+-
+ AC_PREREQ(2.52)
+ AC_INIT(libgamin)
+ AM_CONFIG_HEADER(config.h)
+ AC_CANONICAL_SYSTEM
+ 
++# get any external flags setting before we start playing with the CFLAGS variable
++ENV_CFLAGS="$CFLAGS"
++
+ GAMIN_MAJOR_VERSION=0
+ GAMIN_MINOR_VERSION=1
+ GAMIN_MICRO_VERSION=9
+@@ -37,6 +36,12 @@
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ 
++dnl If the user set no CFLAGS, then don't assume the autotools defaults of
++dnl "-g -O2". We set default CFLAGS later based on the --disable-debug flag.
++if test -z "$ENV_CFLAGS"; then
++	CFLAGS=""
++fi
++
+ dnl for the spec file
+ RELDATE=`date +'%a %b %e %Y'`
+ AC_SUBST(RELDATE)
+@@ -506,44 +511,45 @@
+ AC_MSG_CHECKING(for more compiler warnings)
+ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
+ 	AC_MSG_RESULT(yes)
+-	CFLAGS="\
++	warning_cflags="\
+  -Wall\
+  -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes\
+  -Wnested-externs\
+  -Wsign-compare"
+ 
++	SAVE_CFLAGS="$CFLAGS"
+ 	for option in -Wno-sign-compare; do
+-		SAVE_CFLAGS="$CFLAGS"
+-		CFLAGS="$CFLAGS $option"
++		CFLAGS="$option"
+ 		AC_MSG_CHECKING([whether gcc understands $option])
+ 		AC_TRY_COMPILE([], [],
+ 			has_option=yes,
+ 			has_option=no,)
+-		if test $has_option = no; then
+-			CFLAGS="$SAVE_CFLAGS"
++		if test "$has_option" != "no"; then
++			warning_cflags="$warning_cflags $option"
+ 		fi
+ 		AC_MSG_RESULT($has_option)
+ 		unset has_option
+-		unset SAVE_CFLAGS
+ 	done
++	CFLAGS="$SAVE_CFLAGS"
+ 	unset option
+ else
+ 	AC_MSG_RESULT(no)
+-	unset CFLAGS
+ fi
+ 
+ if test "$GCC" = "yes"; then
+ 	if test "$debug" = "yes"; then
+-		CFLAGS="$CFLAGS -g"
++		debug_cflags="-g"
+ 	else
+-		#don't optimise with -g
++		# autotools defaults to "-O2 -g" for cflags, but we don't
++		# want -g in non-debug builds
+ 		if test -z "$ENV_CFLAGS"; then
+-			ENV_CFLAGS="-O2"
++			CFLAGS="-O2"
+ 		fi
+ 	fi
+ fi
+ 
+-CFLAGS="$CFLAGS $ENV_CFLAGS"
++AM_CFLAGS="$warning_cflags $debug_cflags"
++AC_SUBST(AM_CFLAGS)
+ 
+ dnl ==========================================================================
+ 
+@@ -569,7 +575,7 @@
+         prefix:                   ${prefix}
+         source code location:     ${srcdir}
+         compiler:                 ${CC}
+-        compiler flags:           ${CFLAGS}
++        compiler flags:           ${AM_CFLAGS} ${CFLAGS}
+                                                                                 
+ 	backends:                 ${backends}
+ 	build documentation:      ${build_docs}
diff --git a/app-admin/gamin/gamin-0.1.9.ebuild b/app-admin/gamin/gamin-0.1.9.ebuild
new file mode 100644
index 000000000000..b66e4a7931f6
--- /dev/null
+++ b/app-admin/gamin/gamin-0.1.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.1.9.ebuild,v 1.1 2007/08/07 15:36:23 dsd Exp $
+
+inherit autotools eutils libtool
+
+DESCRIPTION="Library providing the FAM File Alteration Monitor API"
+HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
+SRC_URI="http://www.gnome.org/~veillard/gamin/sources/${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"
+
+RDEPEND=">=dev-libs/glib-2
+	!app-admin/fam"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PROVIDE="virtual/fam"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch "${FILESDIR}/${P}-user-cflags.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
+}
+
+src_compile() {
+	econf --disable-debug \
+		$(use_enable kernel_linux inotify) \
+		$(use_enable debug debug-api) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt
+	dohtml doc/*
+}