diff options
| -rw-r--r-- | dev-libs/libgamin/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/libgamin/Manifest | 13 | ||||
| -rw-r--r-- | dev-libs/libgamin/libgamin-0.1.10-r2.ebuild | 22 |
3 files changed, 26 insertions, 14 deletions
diff --git a/dev-libs/libgamin/ChangeLog b/dev-libs/libgamin/ChangeLog index 7b4a25223933..d1fb308a1037 100644 --- a/dev-libs/libgamin/ChangeLog +++ b/dev-libs/libgamin/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libgamin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.30 2012/04/26 17:30:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.31 2012/04/30 14:29:54 grobian Exp $ + + 30 Apr 2012; Fabian Groffen <grobian@gentoo.org> libgamin-0.1.10-r2.ebuild: + Fix for Prefix, add (Open)Solaris patch, bug #413415 26 Apr 2012; Alexis Ballier <aballier@gentoo.org> libgamin-0.1.10-r2.ebuild: keyword ~amd64-fbsd diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest index b0e879471549..d579b6418017 100644 --- a/dev-libs/libgamin/Manifest +++ b/dev-libs/libgamin/Manifest @@ -9,14 +9,15 @@ AUX libgamin-0.1.10-disable_python_static_library.patch 340 RMD160 9e479b3483d65 AUX libgamin-0.1.10-noinst-lib.patch 2207 RMD160 f0d2479f5aec3ef8852a36214c168ef560de3594 SHA1 544895f7345413c5314b4d5892492e7b27c8eb6b SHA256 e19ede71d259fbe5888c06635441365a48687034b24c5f15edd808a7cbd9cdc7 DIST gamin-0.1.10.tar.bz2 452194 RMD160 6524915876be79b19060571e01ee6a472ed1adee SHA1 c4d5462d8cef5e412f55861bd317dcce5cac3318 SHA256 a59948b20ce2f14136c013f155abb8c8d51db2ea167c063ff33461e453fec10a DIST gamin-0.1.9-freebsd.patch.bz2 4635 RMD160 9f53abfcb9e785e9408cb8f1d35ff36fb739d878 SHA1 3d276802bbab47885dfcba0bbe6422711c84e676 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723 +DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 RMD160 aad5d41806b0fba956e3fb40e0b534c5565347c6 SHA1 94dd40b70af138354711f9a551df03e3c291687f SHA256 9cb1bde5a34888ce4de4c4894c7d31dbfdbfb3279007b9eddf2da35510f6a9b5 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af -EBUILD libgamin-0.1.10-r2.ebuild 3508 RMD160 11bf33dd94d22f8dfbf7c06de294691781080abd SHA1 7b94d606879eb2101d5e1c52cc4565dc030078f3 SHA256 5988347e21cc6673ca6b952e712a7c2f299d2634f2773c2e5302b85f9e6788b6 -MISC ChangeLog 4800 RMD160 337b5eeb0a2297a1a9728e2d7adfdef018b18e48 SHA1 5c5b012a255859ff19908b509c36012f6927e822 SHA256 87fc9877efa7845188cc8bfcef73ce62ae88e4e577be15a2f7d519550c3480e1 +EBUILD libgamin-0.1.10-r2.ebuild 3950 RMD160 aa4046c6f7b285c6e6d8d072b59e74a4adc602c2 SHA1 72d9e5685b752d8a7c49a5b360b246b4d432fd94 SHA256 e526bd55dffec64977d9bb28edf710b25a7d563553919fd42317fb21ae90666a +MISC ChangeLog 4933 RMD160 b4bbf58b173e7df6a02d32a5908e419eeefabe7c SHA1 658a695f05a7a426e12f581740687b89ee59f8b8 SHA256 413f218436a3cb3b36b0feeb6e2a20f183860d6ef8c52d9a9d8420633fdbf114 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.19 (Darwin) -iEYEARECAAYFAk+ZhjcACgkQvFcC4BYPU0rMIQCfT4mwWmvI0+LYBGuICrMii1eM -QJYAoJU9SArkxSHDt83v/6je5q7RoyHN -=sGpM +iEYEARECAAYFAk+eohMACgkQX3X2B8XHTomINwCfSpYz936tzG5KaYcUcW9KwHsm +FvoAn3cE4whtfD3/jrX5opMK/LPYUKt3 +=rHed -----END PGP SIGNATURE----- diff --git a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild index b4de266bdf97..34cbadf38727 100644 --- a/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild +++ b/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.17 2012/04/26 17:30:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.18 2012/04/30 14:29:54 grobian Exp $ EAPI="3" @@ -15,11 +15,12 @@ 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://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.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" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="debug kernel_linux python static-libs" RESTRICT="test" # needs gam-server @@ -40,8 +41,15 @@ src_prepare() { # Fix QA warnings, bug #257281, upstream #466791 epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch - # Fix compile warnings; bug #188923 - epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2 + if [[ ${CHOST} != *-solaris* ]] ; then + # Fix compile warnings; bug #188923 + epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2 + else + # (Open)Solaris necessary patches (changes configure.in), unfortunately + # conflicts with freebsd patch and breaks some linux installs so it must + # only be applied if on solaris. + epatch "${DISTDIR}"/${P}-opensolaris.patch.bz2 + fi # Fix collision problem due to intermediate library, upstream bug #530635 epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch @@ -91,8 +99,8 @@ src_compile() { building() { emake \ - PYTHON_INCLUDES="$(python_get_includedir)" \ - PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \ + PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \ + PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ PYTHON_VERSION="$(python_get_version)" } python_execute_function -s --source-dir python building @@ -106,7 +114,7 @@ src_install() { installation() { emake \ DESTDIR="${D}" \ - PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \ + PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ PYTHON_VERSION="$(python_get_version)" \ install } |