| 1 |
grobian 12/04/30 14:29:54 |
| 2 |
|
| 3 |
Modified: libgamin-0.1.10-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix for Prefix, add (Open)Solaris patch, bug #413415 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.18 dev-libs/libgamin/libgamin-0.1.10-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild?rev=1.18&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild?rev=1.18&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild?r1=1.17&r2=1.18 |
| 15 |
|
| 16 |
Index: libgamin-0.1.10-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v |
| 19 |
retrieving revision 1.17 |
| 20 |
retrieving revision 1.18 |
| 21 |
diff -u -r1.17 -r1.18 |
| 22 |
--- libgamin-0.1.10-r2.ebuild 26 Apr 2012 17:30:26 -0000 1.17 |
| 23 |
+++ libgamin-0.1.10-r2.ebuild 30 Apr 2012 14:29:54 -0000 1.18 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
|
| 32 |
@@ -15,11 +15,12 @@ |
| 33 |
HOMEPAGE="http://www.gnome.org/~veillard/gamin/" |
| 34 |
SRC_URI="${SRC_URI} |
| 35 |
mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 |
| 36 |
+ http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 |
| 37 |
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf |
| 38 |
|
| 39 |
LICENSE="LGPL-2" |
| 40 |
SLOT="0" |
| 41 |
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 42 |
+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" |
| 43 |
IUSE="debug kernel_linux python static-libs" |
| 44 |
|
| 45 |
RESTRICT="test" # needs gam-server |
| 46 |
@@ -40,8 +41,15 @@ |
| 47 |
# Fix QA warnings, bug #257281, upstream #466791 |
| 48 |
epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch |
| 49 |
|
| 50 |
- # Fix compile warnings; bug #188923 |
| 51 |
- epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2 |
| 52 |
+ if [[ ${CHOST} != *-solaris* ]] ; then |
| 53 |
+ # Fix compile warnings; bug #188923 |
| 54 |
+ epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2 |
| 55 |
+ else |
| 56 |
+ # (Open)Solaris necessary patches (changes configure.in), unfortunately |
| 57 |
+ # conflicts with freebsd patch and breaks some linux installs so it must |
| 58 |
+ # only be applied if on solaris. |
| 59 |
+ epatch "${DISTDIR}"/${P}-opensolaris.patch.bz2 |
| 60 |
+ fi |
| 61 |
|
| 62 |
# Fix collision problem due to intermediate library, upstream bug #530635 |
| 63 |
epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch |
| 64 |
@@ -91,8 +99,8 @@ |
| 65 |
|
| 66 |
building() { |
| 67 |
emake \ |
| 68 |
- PYTHON_INCLUDES="$(python_get_includedir)" \ |
| 69 |
- PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \ |
| 70 |
+ PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \ |
| 71 |
+ PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ |
| 72 |
PYTHON_VERSION="$(python_get_version)" |
| 73 |
} |
| 74 |
python_execute_function -s --source-dir python building |
| 75 |
@@ -106,7 +114,7 @@ |
| 76 |
installation() { |
| 77 |
emake \ |
| 78 |
DESTDIR="${D}" \ |
| 79 |
- PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \ |
| 80 |
+ PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ |
| 81 |
PYTHON_VERSION="$(python_get_version)" \ |
| 82 |
install |
| 83 |
} |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.31 dev-libs/libgamin/ChangeLog |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/ChangeLog?rev=1.31&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/ChangeLog?rev=1.31&content-type=text/plain |
| 91 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/ChangeLog?r1=1.30&r2=1.31 |
| 92 |
|
| 93 |
Index: ChangeLog |
| 94 |
=================================================================== |
| 95 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v |
| 96 |
retrieving revision 1.30 |
| 97 |
retrieving revision 1.31 |
| 98 |
diff -u -r1.30 -r1.31 |
| 99 |
--- ChangeLog 26 Apr 2012 17:30:26 -0000 1.30 |
| 100 |
+++ ChangeLog 30 Apr 2012 14:29:54 -0000 1.31 |
| 101 |
@@ -1,6 +1,9 @@ |
| 102 |
# ChangeLog for dev-libs/libgamin |
| 103 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 104 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.30 2012/04/26 17:30:26 aballier Exp $ |
| 105 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.31 2012/04/30 14:29:54 grobian Exp $ |
| 106 |
+ |
| 107 |
+ 30 Apr 2012; Fabian Groffen <grobian@g.o> libgamin-0.1.10-r2.ebuild: |
| 108 |
+ Fix for Prefix, add (Open)Solaris patch, bug #413415 |
| 109 |
|
| 110 |
26 Apr 2012; Alexis Ballier <aballier@g.o> libgamin-0.1.10-r2.ebuild: |
| 111 |
keyword ~amd64-fbsd |
Archives