From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SRj5t-0006Sf-CQ for garchives@archives.gentoo.org; Tue, 08 May 2012 12:00:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 926FBE060F; Tue, 8 May 2012 12:00:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4FFB7E060F for ; Tue, 8 May 2012 12:00:17 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FA9A1B402D for ; Tue, 8 May 2012 12:00:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 210ACE542E for ; Tue, 8 May 2012 12:00:15 +0000 (UTC) From: "Cyprien Nicolas" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Cyprien Nicolas" Message-ID: <1336478391.c9a75daa131ff327c242e6e2f8fa535ef203a085.fulax@gentoo> Subject: [gentoo-commits] proj/lisp:master commit in: dev-scheme/hop/files/, dev-scheme/hop/ X-VCS-Repository: proj/lisp X-VCS-Files: dev-scheme/hop/files/hop-2.3.0-enable-avahi-support.patch dev-scheme/hop/files/hop.initd dev-scheme/hop/hop-2.1.1.ebuild dev-scheme/hop/hop-2.2.0.ebuild dev-scheme/hop/hop-2.3.0.ebuild X-VCS-Directories: dev-scheme/hop/files/ dev-scheme/hop/ X-VCS-Committer: fulax X-VCS-Committer-Name: Cyprien Nicolas X-VCS-Revision: c9a75daa131ff327c242e6e2f8fa535ef203a085 X-VCS-Branch: master Date: Tue, 8 May 2012 12:00:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f89fd6c4-8251-476d-bcf3-d57d4b140110 X-Archives-Hash: 2966088551f62f7006d6f0bf3a6e5ddd commit: c9a75daa131ff327c242e6e2f8fa535ef203a085 Author: Cyprien Nicolas (fulax) gmail co= m> AuthorDate: Tue May 8 11:59:51 2012 +0000 Commit: Cyprien Nicolas gmail com> CommitDate: Tue May 8 11:59:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/lisp.git;a=3D= commit;h=3Dc9a75daa dev-scheme/hop: bump to 2.3.0, requires >=3Dbigloo-3.8a. Fix bigloo depen= dencies for older hop versions. (Portage version: 2.2.0_alpha101/git/Linux i686, signed Manifest commit w= ith key 0xBE63A96F) --- .../hop/files/hop-2.3.0-enable-avahi-support.patch | 12 +++++++++++ dev-scheme/hop/files/hop.initd | 4 +- dev-scheme/hop/hop-2.1.1.ebuild | 4 +- dev-scheme/hop/hop-2.2.0.ebuild | 4 +- .../hop/{hop-2.2.0.ebuild =3D> hop-2.3.0.ebuild} | 21 ++++++++++++= ++++--- 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dev-scheme/hop/files/hop-2.3.0-enable-avahi-support.patch b/= dev-scheme/hop/files/hop-2.3.0-enable-avahi-support.patch new file mode 100644 index 0000000..629059a --- /dev/null +++ b/dev-scheme/hop/files/hop-2.3.0-enable-avahi-support.patch @@ -0,0 +1,12 @@ +--- hop-2.3.0-pre1/configure.orig 2012-03-19 18:52:12.000000000 +0100 ++++ hop-2.3.0-pre1/configure 2012-03-22 11:03:05.000000000 +0100 +@@ -254,6 +254,9 @@ + --disable-ssl) + ssl=3Dno;; +=20 ++ --enable-avahi) ++ avahi=3Dyes;; ++ + --disable-avahi) + avahi=3Dno;; +=20 diff --git a/dev-scheme/hop/files/hop.initd b/dev-scheme/hop/files/hop.in= itd index bcfb379..50f8fde 100644 --- a/dev-scheme/hop/files/hop.initd +++ b/dev-scheme/hop/files/hop.initd @@ -13,14 +13,14 @@ start() { ebegin "Starting Hop Web Broker" start-stop-daemon --start --background \ --make-pidfile --pidfile ${PIDFILE} \ - --exec ${HOPEXEC} --chuid ${HOPUSER} \ + --exec ${HOPEXEC} --user ${HOPUSER} \ --env HOME=3D${HOPHOME} -- ${HOP_OPTS} eend $? } =20 stop() { ebegin "Stopping Hop Web Broker" - start-stop-daemon --stop \ + start-stop-daemon --signal 9 \ --exec ${HOPEXEC} --pidfile ${PIDFILE} eend $? } diff --git a/dev-scheme/hop/hop-2.1.1.ebuild b/dev-scheme/hop/hop-2.1.1.e= build index 301abcd..d9727b1 100644 --- a/dev-scheme/hop/hop-2.1.1.ebuild +++ b/dev-scheme/hop/hop-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -14,7 +14,7 @@ SLOT=3D"0" LICENSE=3D"GPL-2" KEYWORDS=3D"~amd64 ~x86" =20 -DEPEND=3D">=3Ddev-scheme/bigloo-3.4a[ssl?,threads?,multimedia,sqlite,web= ]" +DEPEND=3D"~dev-scheme/bigloo-3.4a_p3[ssl?,threads?,multimedia,sqlite,web= ]" =20 RDEPEND=3D"${DEPEND}" =20 diff --git a/dev-scheme/hop/hop-2.2.0.ebuild b/dev-scheme/hop/hop-2.2.0.e= build index 3a0389a..9aa3636 100644 --- a/dev-scheme/hop/hop-2.2.0.ebuild +++ b/dev-scheme/hop/hop-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -17,7 +17,7 @@ LICENSE=3D"GPL-2" KEYWORDS=3D"~amd64 ~x86" IUSE=3D"debug ssl threads" =20 -DEPEND=3D">=3Ddev-scheme/bigloo-3.6a[ssl?,threads?,multimedia,sqlite,web= ]" +DEPEND=3D"~dev-scheme/bigloo-3.6a[ssl?,threads?,multimedia,sqlite,web]" RDEPEND=3D"${DEPEND}" =20 S=3D"${WORKDIR}/${MY_P}" diff --git a/dev-scheme/hop/hop-2.2.0.ebuild b/dev-scheme/hop/hop-2.3.0.e= build similarity index 78% copy from dev-scheme/hop/hop-2.2.0.ebuild copy to dev-scheme/hop/hop-2.3.0.ebuild index 3a0389a..f45d25b 100644 --- a/dev-scheme/hop/hop-2.2.0.ebuild +++ b/dev-scheme/hop/hop-2.3.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D"2" +EAPI=3D4 =20 MY_P=3D${P/_/-} =20 @@ -15,11 +15,13 @@ SRC_URI=3D"ftp://ftp-sop.inria.fr/indes/fp/Hop/${MY_P= }.tar.gz" SLOT=3D"0" LICENSE=3D"GPL-2" KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"debug ssl threads" +IUSE=3D"avahi debug ssl threads" =20 -DEPEND=3D">=3Ddev-scheme/bigloo-3.6a[ssl?,threads?,multimedia,sqlite,web= ]" +DEPEND=3D">=3Ddev-scheme/bigloo-3.8a[avahi?,ssl?,threads?,multimedia,sql= ite,web]" RDEPEND=3D"${DEPEND}" =20 +RESTRICT=3D"mirror" + S=3D"${WORKDIR}/${MY_P}" =20 pkg_setup() { @@ -27,6 +29,11 @@ pkg_setup() { enewuser hop -1 -1 /var/lib/hop hop } =20 +src_prepare() { + epatch "${FILESDIR}/${P}-enable-avahi-support.patch" + epatch_user +} + src_configure() { # Hop doesn't use autoconf and consequently a lot of options used by ec= onf give errors # Manuel Serrano says: "Please, dont talk to me about autoconf. I simpl= y dont want to hear about it..." @@ -36,6 +43,7 @@ src_configure() { --libdir=3D/usr/$(get_libdir) \ --etcdir=3D/etc/hop \ --webletsdir=3D"/usr/share/${PN}/weblets" \ + $(use_enable avahi) \ $(use_enable ssl) \ $(use_enable threads) \ $(use debug && echo "--debug") \ @@ -49,6 +57,11 @@ src_compile () { src_install () { emake DESTDIR=3D"${D}" install || die "install failed" =20 + # Create home dir + keepdir /var/lib/hop + fowners hop:hop /var/lib/hop + fperms 0750 /var/lib/hop + # Create log dir keepdir /var/log/hop fowners root:hop /var/log/hop