Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 413415 - dev-libs/libgamin: Port Gentoo Prefix modifications to gx86
Summary: dev-libs/libgamin: Port Gentoo Prefix modifications to gx86
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Freedesktop bugs
URL:
Whiteboard:
Keywords: Inclusion
Depends on:
Blocks:
 
Reported: 2012-04-24 20:48 UTC by Jeremy Olexa (darkside) (RETIRED)
Modified: 2012-04-30 14:29 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2012-04-24 20:48:50 UTC
As a spinoff from bug 413403, here is a diff:

Index: libgamin-0.1.10-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v
retrieving revision 1.16
diff -u -r1.16 libgamin-0.1.10-r2.ebuild
--- libgamin-0.1.10-r2.ebuild   22 Feb 2012 01:07:21 -0000      1.16
+++ libgamin-0.1.10-r2.ebuild   24 Apr 2012 20:47:28 -0000
@@ -19,7 +19,7 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux python static-libs"
 
 RESTRICT="test" # needs gam-server
@@ -41,11 +41,18 @@
        epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch
 
        # Fix compile warnings; bug #188923
-       epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2
+       [[ ${CHOST} != *-solaris* ]] && \
+               epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2
 
        # Fix collision problem due to intermediate library, upstream bug #530635
        epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch
 
+       # (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.
+       [[ ${CHOST} == *-solaris* ]] && \
+               epatch "${FILESDIR}"/${P}-opensolaris.patch
+
        # Fix compilation with latest glib, bug #382783
        epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
 
cvs diff: files/libgamin-0.1.10-opensolaris.patch is a new entry, no comparison available
Comment 2 Pacho Ramos gentoo-dev 2012-04-25 08:32:48 UTC
I am ok with that changes (specially since gamin will now be used only for prefix and bsds)
Comment 3 Fabian Groffen gentoo-dev 2012-04-30 14:29:56 UTC
Committed, thanks