Remove unnecessary python.eclass inherit. Bump to EAPI=5.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 110 insertions, 12 deletions

diff --git a/app-admin/gam-server/ChangeLog b/app-admin/gam-server/ChangeLog
index 58e26f981c2f..1f5128fbd3ad 100644
--- a/app-admin/gam-server/ChangeLog
+++ b/app-admin/gam-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/gam-server
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v 1.24 2013/04/28 13:04:13 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gam-server/ChangeLog,v 1.25 2014/04/12 08:50:47 mgorny Exp $
+
+*gam-server-0.1.10-r2 (12 Apr 2014)
+
+  12 Apr 2014; Michał Górny <mgorny@gentoo.org> +gam-server-0.1.10-r2.ebuild:
+  Remove unnecessary python.eclass inherit. Bump to EAPI=5.
 
   28 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
   gam-server-0.1.10-r1.ebuild:
@@ -100,4 +105,3 @@
   +gam-server-0.1.10.ebuild:
   New ebuild split off gamin. Initial ebuild inspired by Pacho Ramos, closes
   bug #217861.
-
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index f5a7e5d89ea9..a72345ffa3c4 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -10,16 +10,25 @@ DIST gamin-0.1.10.tar.bz2 452194 SHA256 a59948b20ce2f14136c013f155abb8c8d51db2ea
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b WHIRLPOOL 462173a33e8f804b71c6991aa5925a5c9a6ee83f80b13967369c5c45721069e629c052e5daebfc3fb03bbad4d3054b523afb6e430db997581f3ff942f7da3180
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
 EBUILD gam-server-0.1.10-r1.ebuild 2577 SHA256 97a76076f990734e3e13f5662cd363e36440676c20713cad4f1bd38a71b093fd SHA512 90ecdb77398a11ab9edf8d5a7c62b71fc61277c723e9d0b7af973d4ca78f76a08c79e64808e1c42f288fef8b1c550c541b0addbb0079897ed8acb4d1ad0253f3 WHIRLPOOL 8e67616ea0e71263eb20dd59b661b9f69cc09de765806c9513a06b24a2e5f8492c2cfcb804b39a85720a032c950609f6950ed05056ad5c8b9478b0b0c45b2e7d
-MISC ChangeLog 4010 SHA256 0c3a4e52f2aecac2a531ea9a75f666e0f774ea1db411eff89752e2cd24e5c61b SHA512 51d6a0e41ab6fc040935b3f7502a145d1c14d575806e3f8cac76ba84fce137bdc7d13a745c240eceef0024be2dcad7696746598d2c5a767c58c68975b549595c WHIRLPOOL 8d1d844e843c57ec11a625f8e6cd426c00db6fbad8cf49fc45cb3c048e6c0b548b04f7534139d5710cb8b954929e62a8cb87b1d3a967a9da16aa6cde866187fd
+EBUILD gam-server-0.1.10-r2.ebuild 2605 SHA256 e1a3aaf10cf477c6a6cea30ab6b0aaaf67c33644cc44872b6dfe7a4c87cbe534 SHA512 465bd7289cbb4296f01ba7db2ff9422d4d5e64cb9f0a99b800777f7d6a60f8b042098fab5eb9734139fc5e230160fa351a01e870696d12c162ce9751c7a19944 WHIRLPOOL 020f7b687b43a77e0d1cdf03c9fb8272d7722981c6ad26697e94c238199216984b56fbed75c5e8993b32b1b7d4c1f24015a9fa4519876e58844a5beabe16ac09
+MISC ChangeLog 4184 SHA256 846f99cde7bb8422dc5030c0b86762147978c74b88201dd688318683ea4c5abd SHA512 40f30929d4fdf41d27ef7f3a7e2f9f1aab2735c5f03b925a78c2cb51fdaf067074192ac7191490c09f4e75c65705f5d2dd3e1c2a9e27718174ab959ba243df43 WHIRLPOOL fcd04922516cc88fa99f5c3a17c34a56703b63f82d7c4c60c3906e1d97db371d6a5debd9e30c1dbb8403b81b2ca53f1c45d312ea70ad6e4f658a6430ac71ae47
 MISC metadata.xml 244 SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c SHA512 9f697206cf152d13b2a3e26645959ab3353a34e4158832139689359aad999114afb8ed80e2f82464674f358434a891d74f2e94079c2c57fc7a125d17e735ff71 WHIRLPOOL 47f92e411c189c765f6665e28402aa0411ebe898b306925cf395ed23085738120fb4075682d6c86f5818de5a3d70cfeca2fda163e3eb83764ba0b4d8dce1fb04
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRfR3vAAoJEEdUh39IaPFNGlsH/2S81L2361R4uNHobt3LI/t/
-4W+bvQYV8UBvO4KE1MYKPqih3BkU6byCxAk6VNUjAR6ZWqK5ZHRl9YwasOOUuZxy
-rLqO3XDOPfIaY71Y27lpA4a/3jZh0RcWi4gCoKYPAavMkqMbu8D3Vugf8dTHRL3W
-GETi/xQ4+TgJ6hK0dMaOaNXmjSioVFmJbDabj5V9oxRq0Flz6rEzRvopUBs7PH6Y
-E6+ApYPGbkd78dEPfAYgFpKQ1VYVZJ1HwyACPyB504OfFhEP/Bk1szk/ucmzQgsZ
-QSq0iwYtiF4UizKYiRstDIfXiUFmg7VCOkLVvwfQArD/NpdW7uL/KRGwOSvSjwc=
-=m6x8
+iQJ8BAEBCABmBQJTSP5oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOOLIQAOAd4taj2z7uB8SD9Ehl1Af2
+kz0DFr6NplmKe+nLfm9X0bg9ar3Ur2LzYg1BPP9phU0gUDPJeTQ83XVjcUL7jhbt
+GyB7SJyeQGC+Whg2EQK/GpaosGE6MZhlizTUbYgLyDKnixCToTBFOabFzMgS/8ov
+Eo3YDxvmka/3q+7F+JqvnLnTv7aWh8s2ajbS1ShtDu8xtKeK7mX6GTwXBodcgioL
+1w3EFGUuB1KpGSEFVnddx7m4SipjPtFYjraiuyoWrsCHJ0uy7eiAMmcTa0gV/Ing
+JDz5ETXHFIvexLtiZzDp1gBuvuMJ85SWiQhATFZGpkcZMc3BBlC1wVv0PnJVAJQC
+xzEKBv67zy2MS8kW8LkfMBpYV4SqQhmcdciu2qtBPvSjkipXBSEcdIfP0qMOSv+J
+ubb/RMug2+eXuExQmIXcH2bzO4LCb8WiVM4K1jj7WjuDAUFqN8iTyziP9KW2NkrF
+zU2T4xbQooGBtsuyNkOFKfylRHcv131iidzTSu7WafXimmOIpTATsL/TF7mnat0m
+AGJh+gqYRQdM3CGMBpwwlxokxyx81qXVDv1J4+luh88HEngTljLl9WpdzS6dbfiP
+i6M1uxgnXZytumIe2F1ZtCOg1Fzot55AhE4uB2TiixqLoXjGpctP/BjXzKLHI/26
+EM8d4ecfvrC07BUMdUXp
+=qM1g
 -----END PGP SIGNATURE-----
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
new file mode 100644
index 000000000000..36d22042e6ca
--- /dev/null
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 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-r2.ebuild,v 1.1 2014/04/12 08:50:47 mgorny Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="gamin"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils flag-o-matic libtool multilib gnome.org
+
+DESCRIPTION="Library providing the FAM File Alteration Monitor API"
+HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
+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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="debug kernel_linux"
+
+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_prepare() {
+	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+
+	# Fix compile warnings; bug #188923
+	epatch "${DISTDIR}/gamin-0.1.9-freebsd.patch.bz2"
+
+	# Fix file-collision due to shared library, upstream bug #530635
+	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"
+
+	# Fix deadlocks with glib-2.32, bug #413331, upstream #667230
+	epatch "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch"
+
+	# Drop DEPRECATED flags
+	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
+
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.in || die #466948
+
+	# 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
+	AT_M4DIR="${WORKDIR}" eautoreconf
+}
+
+src_configure() {
+	# fixes bug 225403
+	#append-flags "-D_GNU_SOURCE"
+
+	if ! has_version virtual/pkgconfig; then
+		export DAEMON_CFLAGS="-I/usr/include/glib-2.0 -I/usr/$(get_libdir)/glib-2.0/include"
+		export DAEMON_LIBS="-lglib-2.0"
+	fi
+
+	econf \
+		--disable-debug \
+		--disable-libgamin \
+		--without-python \
+		$(use_enable kernel_linux inotify) \
+		$(use_enable debug debug-api)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}