From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E4A8B1397EC for ; Wed, 19 Aug 2015 19:40:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 153D41412D; Wed, 19 Aug 2015 19:40:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB65C1412D for ; Wed, 19 Aug 2015 19:40:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9379A340756 for ; Wed, 19 Aug 2015 19:40:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BC4B153 for ; Wed, 19 Aug 2015 19:40:39 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1440013205.ffaa7c1eaeda88f94ce54bf282be2476aef0fb8d.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/gam-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/gam-server/gam-server-0.1.10-r2.ebuild X-VCS-Directories: app-admin/gam-server/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: ffaa7c1eaeda88f94ce54bf282be2476aef0fb8d X-VCS-Branch: master Date: Wed, 19 Aug 2015 19:40:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b474e623-1b5f-4608-a233-81644b647651 X-Archives-Hash: 0778ca03287e6c79ca7690e5f7fe5f7b commit: ffaa7c1eaeda88f94ce54bf282be2476aef0fb8d Author: Fabian Groffen gentoo org> AuthorDate: Wed Aug 19 19:38:01 2015 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Aug 19 19:40:05 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffaa7c1e app-admin/gam-server: Fix for Prefix and Solaris Package-Manager: portage-2.2.20-prefix app-admin/gam-server/gam-server-0.1.10-r2.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 index 5ca1a58..a699932 100644 --- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild +++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI="${SRC_URI} 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-solaris" IUSE="debug kernel_linux" RDEPEND=">=dev-libs/glib-2:2 @@ -67,8 +67,12 @@ src_configure() { # fixes bug 225403 #append-flags "-D_GNU_SOURCE" + # Solaris' patchs adds this to configure, but it conflicts with + # Gentoo's FreeBSD patch. + [[ ${CHOST} == *-solaris* ]] && append-libs socket nsl + 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_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" export DAEMON_LIBS="-lglib-2.0" fi