[gentoo-commits] gentoo-x86 commit in app-admin/gam-server: ChangeLog gam-server-0.1.10.ebuild

[Pacho Ramos (pacho)]

pacho       11/09/25 16:17:35

  Modified:             ChangeLog gam-server-0.1.10.ebuild
  Log:
  Fix compilation with latest glib, bug #382783 by Maciej Piechotka; fix crosscompilation issues, bug #267604 by Andrei Slavoiu; enable linux specific features on armel, upstream bug #588338; drop DG_DISABLE_DEPRECATED; don't try to even check for python, simplifying ebuild for people running python3 as main interpreter; use gnome.org eclass to set SRC_URI and use bz2 tarball instead of gz.
  
  (Portage version: 2.1.10.19/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 app-admin/gam-server/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog	11 Jul 2011 04:25:40 -0000	1.10
+++ ChangeLog	25 Sep 2011 16:17:35 -0000	1.11
@@ -1,6 +1,17 @@
 # ChangeLog for app-admin/gam-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v 1.10 2011/07/11 04:25:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v 1.11 2011/09/25 16:17:35 pacho Exp $
+
+  25 Sep 2011; Pacho Ramos <pacho@g.o> gam-server-0.1.10.ebuild,
+  +files/gam-server-0.1.10-G_CONST_RETURN-removal.patch,
+  +files/gam-server-0.1.10-armel-features.patch,
+  +files/gam-server-0.1.10-crosscompile-fix.patch:
+  Fix compilation with latest glib, bug #382783 by Maciej Piechotka; fix
+  crosscompilation issues, bug #267604 by Andrei Slavoiu; enable linux specific
+  features on armel, upstream bug #588338; drop DG_DISABLE_DEPRECATED; don't
+  try to even check for python, simplifying ebuild for people running python3
+  as main interpreter; use gnome.org eclass to set SRC_URI and use bz2 tarball
+  instead of gz.
 
   11 Jul 2011; Samuli Suominen <ssuominen@g.o> gam-server-0.1.10.ebuild:
   Stop depending on dev-util/pkgconfig wrt #374775 by dragos240



1.11                 app-admin/gam-server/gam-server-0.1.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/gam-server-0.1.10.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/gam-server-0.1.10.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gam-server/gam-server-0.1.10.ebuild?r1=1.10&r2=1.11

Index: gam-server-0.1.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gam-server-0.1.10.ebuild	11 Jul 2011 04:25:40 -0000	1.10
+++ gam-server-0.1.10.ebuild	25 Sep 2011 16:17:35 -0000	1.11
@@ -1,16 +1,16 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10.ebuild,v 1.10 2011/07/11 04:25:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/gam-server-0.1.10.ebuild,v 1.11 2011/09/25 16:17:35 pacho Exp $
 
-inherit autotools eutils flag-o-matic libtool multilib python
+EAPI="3"
+GNOME_ORG_MODULE="gamin"
 
-MY_PN="gamin"
-MY_P=${MY_PN}-${PV}
+inherit autotools eutils flag-o-matic libtool multilib python gnome.org
 
 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
-	mirror://gentoo/${MY_PN}-0.1.9-freebsd.patch.bz2
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
 	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
 
 LICENSE="LGPL-2"
@@ -18,26 +18,35 @@
 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
+RDEPEND=">=dev-libs/glib-2:2
 	>=dev-libs/libgamin-0.1.10
 	!app-admin/fam
 	!<app-admin/gamin-0.1.10"
 
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+#S=${WORKDIR}/${MY_P}
 
+src_prepare() {
 	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
 
 	# Fix compile warnings; bug #188923
-	epatch "${DISTDIR}/${MY_PN}-0.1.9-freebsd.patch.bz2"
+	epatch "${DISTDIR}/gamin-0.1.9-freebsd.patch.bz2"
 
 	# Fix file-collision due to shared library, upstream bug #530635
-	epatch "${FILESDIR}/${P}-noinst-lib.patch"
+	epatch "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch"
+
+	# Fix compilation with latest glib, bug #382783
+	epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
+
+	# Fix crosscompilation issues, bug #267604
+	epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
+
+	# Enable linux specific features on armel, upstream bug #588338
+	epatch "${FILESDIR}/${P}-armel-features.patch"
+
+	# Drop DEPRECATED flags
+	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
 
 	# autoconf is required as the user-cflags patch modifies configure.in
 	# however, elibtoolize is also required, so when the above patch is
@@ -45,7 +54,7 @@
 	AT_M4DIR="${WORKDIR}" eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# fixes bug 225403
 	#append-flags "-D_GNU_SOURCE"
 
@@ -57,10 +66,9 @@
 	econf \
 		--disable-debug \
 		--disable-libgamin \
+		--without-python \
 		$(use_enable kernel_linux inotify) \
 		$(use_enable debug debug-api)
-
-	emake || die
 }
 
 src_install() {