diff options
Diffstat (limited to 'net-p2p/gnunet')
| -rw-r--r-- | net-p2p/gnunet/ChangeLog | 11 | ||||
| -rw-r--r-- | net-p2p/gnunet/Manifest | 10 | ||||
| -rw-r--r-- | net-p2p/gnunet/files/gnunet | 31 | ||||
| -rw-r--r-- | net-p2p/gnunet/files/gnunet-download-manager.scm | 407 | ||||
| -rw-r--r-- | net-p2p/gnunet/files/gnunet.initd (renamed from net-p2p/gnunet/files/gnunet-2) | 6 | ||||
| -rw-r--r-- | net-p2p/gnunet/gnunet-0.7.2c-r1.ebuild (renamed from net-p2p/gnunet/gnunet-0.7.2c.ebuild) | 16 | ||||
| -rw-r--r-- | net-p2p/gnunet/gnunet-0.7.3-r1.ebuild (renamed from net-p2p/gnunet/gnunet-0.7.3.ebuild) | 16 |
7 files changed, 25 insertions, 472 deletions
diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog index b7445ff57383..88e228a00e86 100644 --- a/net-p2p/gnunet/ChangeLog +++ b/net-p2p/gnunet/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-p2p/gnunet # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.60 2008/01/16 15:01:59 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.61 2008/02/04 15:24:55 armin76 Exp $ + +*gnunet-0.7.3-r1 (04 Feb 2008) +*gnunet-0.7.2c-r1 (04 Feb 2008) + + 04 Feb 2008; Raúl Porcel <armin76@gentoo.org> -files/gnunet-2, + -files/gnunet, +files/gnunet.initd, -files/gnunet-download-manager.scm, + -gnunet-0.7.2c.ebuild, +gnunet-0.7.2c-r1.ebuild, -gnunet-0.7.3.ebuild, + +gnunet-0.7.3-r1.ebuild: + Revision bump to fix bug #207301 and bug #207318 *gnunet-0.7.3 (16 Jan 2008) diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest index 0d441efc5278..4170cf2f1e7e 100644 --- a/net-p2p/gnunet/Manifest +++ b/net-p2p/gnunet/Manifest @@ -1,9 +1,7 @@ -AUX gnunet 805 RMD160 7b464895de53b299b2ba0779e14fb7f85fe47697 SHA1 fc72f946add2a03eb1577181f43671d416e94ef8 SHA256 657e8add8f4118f6e6cb5dd32a3e43b7965ef9f465d834a971ce1d7a32282a5f -AUX gnunet-2 643 RMD160 fafedd387fc29a18f82bf52d57431435bb4a877e SHA1 2bad14877263c61130948062ccb40785c9ef857e SHA256 a7f43c1a05240593cb828aef66a2ea5fb14aa1d93a4f6cd709054eae1cebe919 -AUX gnunet-download-manager.scm 13338 RMD160 a8eaa266c3cbc012fcce4a011ad410b7f0630482 SHA1 2132de94ddeb3dbdb0f6f0935cc5aa591b1f5ca9 SHA256 a49047daf991597c869e43d300808990e3edfdf4f814a3e18b08d763fa84d7aa +AUX gnunet.initd 643 RMD160 434eb6752143fbb600f96a58ed7c5ba1a47e654d SHA1 de7f208ce286a05310551a35345b2f02f5712831 SHA256 c6748f137d7c808685a741617e1449024bcb37dcfc11e883d859f5e0134744a6 DIST GNUnet-0.7.2c.tar.bz2 1438415 RMD160 07de80c337fe347dc7ffaae35042eb7fb8e5c5da SHA1 d2d7e12d405f2ee4bd328348bf96422ad1fe2851 SHA256 d8bca30c01f3b105b2738fae7f64b4728ca0eddbea24117a3f3d7022f77e70aa DIST GNUnet-0.7.3.tar.bz2 1687898 RMD160 df986c0f4dccf5ae64a65e54fc0837d77f7f9387 SHA1 4ceffe6126caeeb478f18a1e29110fa852e3826f SHA256 378ea16fdd8b43d0c002a9c2bd4bcb878b60b61608838cd329821d5ffded25b7 -EBUILD gnunet-0.7.2c.ebuild 2893 RMD160 a11c042dae2dca2959a110d3d88fe0ea2fe5daff SHA1 295ec437f8db10446855035ed29db0d4577ef170 SHA256 8979474410234da4cedfaf37d4081f4ab3eef6787090fb0a55e7cfefddbf90c0 -EBUILD gnunet-0.7.3.ebuild 2893 RMD160 54b2f4bb35767afcede27630ad55770629d076da SHA1 01fd2fb373dbf240c2ff6463ceeec6bf99d1d9a0 SHA256 c493f2bd9b7d1fd51afbc67a2e73d749c146216e756a5b062bb3d6076fb9c7ba -MISC ChangeLog 9580 RMD160 02d6cb0a89f25fefa5a18f238de9d99105588f4d SHA1 b6f609bac421dfefa9fb0fdfbdde64bceb6727fd SHA256 dc697c3bb107239109ed9c3b221a32852dcdea9cea17837ee9f4f34026e3d8ab +EBUILD gnunet-0.7.2c-r1.ebuild 2732 RMD160 8e5b6336d3545c1df79ee6190156d49d47674ac8 SHA1 65dd62f4e80c67b49a37bca73d66bc4e717bab18 SHA256 f616a07099fbca31389f73f1b0f0b79d920db55712bf893df6c6c1d23396b300 +EBUILD gnunet-0.7.3-r1.ebuild 2732 RMD160 26a52520edd1ddd6ae2840b1651fd047a29fdde8 SHA1 81d45368784277df1c0b70521a7975ba9758f0c4 SHA256 e6887b0164d3c357bfa832c2234738706efd0d9de0949177be7d85729097c575 +MISC ChangeLog 9936 RMD160 889220634f1d5b1bcfb432dc10edb62d67e4ed61 SHA1 706c036d044e00b1176be3919bb0a20aadb08c40 SHA256 71828f50ada7ef571bcc2448a0fd0a7748b7433ef7876a43e3b1571be88d6bcc MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f diff --git a/net-p2p/gnunet/files/gnunet b/net-p2p/gnunet/files/gnunet deleted file mode 100644 index b1e833a9ddc1..000000000000 --- a/net-p2p/gnunet/files/gnunet +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# description: Gnunet is an anonymous distributed secure network -# this server is required to connect to the network, -# it will open a TCP port to communicate with the -# GUI and an UDP port to communicate with the world. - -depend() { - need net -} - -start() { - ebegin "Starting GNUnet" - # -u username, -c path to gnunet.conf file - start-stop-daemon --start --quiet --background --exec /usr/bin/gnunetd \ - -- -u gnunet -c /var/lib/GNUnet/gnunet.conf - eend $? "Failed to start GNUnet" -} - -stop() { - ebegin "Stopping GNUnet" - killall gnunetd - eend $? "Failed to stop GNUnet" -} - -restart() { - svc_stop - sleep 3 - svc_start -} diff --git a/net-p2p/gnunet/files/gnunet-download-manager.scm b/net-p2p/gnunet/files/gnunet-download-manager.scm deleted file mode 100644 index 80d04fa129fb..000000000000 --- a/net-p2p/gnunet/files/gnunet-download-manager.scm +++ /dev/null @@ -1,407 +0,0 @@ -#!/bin/sh -exec guile -e main -s "$0" "$@" -!# - -;;; gnunet-download-manager -- Manage GNUnet downloads. -;;; Copyright (C) 2004 Ludovic Courtès -;;; -;;; This program is free software; you can redistribute it and/or -;;; modify it under the terms of the GNU General Public License -;;; as published by the Free Software Foundation; either version 2 -;;; of the License, or (at your option) any later version. -;;; -;;; This program is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program; if not, write to the Free Software -;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -;;; Remember ongoing GNUnet downloads so as to be able to resume them -;;; later. Typical usage is to define the following alias in your -;;; favorite shell: -;;; -;;; alias gnunet-download='gnunet-download-manager.scm download' -;;; -;;; You may have a ~/.gnunet-download-manager.scm Scheme configuration -;;; file. In particular, if you would like to be notified of -;;; completed downloads, you may want to add the following line to -;;; your configuration file: -;;; -;;; (add-hook! *completed-download-hook* -;;; completed-download-notification-hook) -;;; -;;; This script works fine with GNU Guile 1.6.4, and doesn't run with -;;; Guile 1.4.x. -;;; -;;; Enjoy! -;;; Ludovic Courtès <ludo@chbouib.org> - -(use-modules (ice-9 format) - (ice-9 optargs) - (ice-9 regex) - (ice-9 and-let-star) - (ice-9 pretty-print) - (ice-9 documentation)) - -;; Overall user settings -(define *debug?* #f) -(define *rc-file* (string-append (getenv "HOME") - "/.gnunet-download-manager.scm")) -(define *status-directory* (string-append (getenv "HOME") "/" - ".gnunet-download-manager")) -(define *gnunet-download* "gnunet-download") - -;; Helper macros -(define-macro (gnunet-info fmt . args) - `(format #t (string-append *program-name* ": " ,fmt "~%") - ,@args)) - -(define-macro (gnunet-debug fmt . args) - (if *debug?* - (cons 'gnunet-info (cons fmt args)) - #t)) - -(define-macro (gnunet-error fmt . args) - `(and ,(cons 'gnunet-info (cons fmt args)) - (exit 1))) - -(define (exception-string key args) - "Describe an error, using the format from @var{args}, if available." - (if (< (length args) 4) - (format #f "Scheme exception: ~S" key) - (string-append - (if (string? (car args)) - (string-append "In " (car args)) - "Scheme exception") - ": " - (apply format `(#f ,(cadr args) ,@(caddr args)))))) - - -;; Regexps matching GNUnet URIs -(define *uri-base* - "([[:alnum:]]+)\.([[:alnum:]]+)\.([[:alnum:]]+)\.([0-9]+)") -(define *uri-re* - (make-regexp (string-append "^gnunet://afs/" *uri-base* "$") - regexp/extended)) -(define *uri-status-file-re* - (make-regexp (string-append "^" *uri-base* "$") - regexp/extended)) - - -(define (uri-status-file-name directory uri) - "Return the name of the status file for URI @var{uri}." - (let ((match (regexp-exec *uri-re* uri))) - (if (not match) - (and (gnunet-info "~a: Invalid URI" uri) #f) - (let ((start (match:start match 1)) - (end (match:end match 4))) - (string-append directory "/" - (substring uri start end)))))) - -(define (uri-status directory uri) - "Load the current status alist for URI @var{uri} from @var{directory}." - (gnunet-debug "uri-status") - (let ((filename (uri-status-file-name directory uri))) - (catch 'system-error - (lambda () - (let* ((file (open-input-file filename)) - (status (read file))) - (begin - (close-port file) - status))) - (lambda (key . args) - (and (gnunet-debug (exception-string key args)) - '()))))) - -(define (process-exists? pid) - (false-if-exception (begin (kill pid 0) #t))) - -(define (fork-and-exec directory program . args) - "Launch @var{program} and return its PID." - (gnunet-debug "fork-and-exec: ~a ~a" program args) - (let ((pid (primitive-fork))) - (if (= 0 pid) - (begin - (if directory (chdir directory)) - (apply execlp (cons program (cons program args)))) - pid))) - -(define* (start-downloader downloader uri options - #:key (directory #f)) - "Start the GNUnet downloader for URI @var{uri} with options -@var{options}. Return an alist describing the download status." - (catch 'system-error - (lambda () - (let* ((pid (apply fork-and-exec - `(,(if directory directory (getcwd)) - ,downloader - ,@options)))) - (gnunet-info "Launched process ~a" pid) - `((uri . ,uri) - (working-directory . ,(if directory directory (getcwd))) - (options . ,options) - (pid . ,(getpid)) - (downloader-pid . ,pid)))) - (lambda (key . args) - (gnunet-error (exception-string key args))))) - -(define (download-process-alive? uri-status) - "Return true if the download whose status is that described by -@var{uri-status} is still alive." - (let ((pid (assoc-ref uri-status 'pid)) - (downloader-pid (assoc-ref uri-status 'downloader-pid))) - (and (process-exists? pid) - (process-exists? downloader-pid)))) - -(define (start-file-download downloader status-dir uri options) - "Dowload the file located at @var{uri}, with options @var{options} -and return an updated status alist." - (gnunet-debug "start-file-download") - (let ((uri-status (uri-status status-dir uri))) - (if (null? uri-status) - (acons 'start-date (current-time) - (start-downloader downloader uri options)) - (if (download-process-alive? uri-status) - (and (gnunet-info "~a already being downloaded by process ~a" - uri (assoc-ref uri-status 'pid)) - #f) - (and (gnunet-info "Resuming download") - (let ((start-date (assoc-ref uri-status 'start-date)) - (dir (assoc-ref uri-status 'working-directory)) - (options (assoc-ref uri-status 'options))) - (acons 'start-date start-date - (start-downloader downloader uri options - #:directory dir)))))))) - -(define *completed-download-hook* (make-hook 1)) - -(define (download-file downloader status-dir uri options) - "Start downloading file located at URI @var{uri}, with options -@var{options}, resuming it if it's already started." - (catch 'system-error - (lambda () - (and-let* ((status (start-file-download downloader - status-dir - uri options)) - (pid (assoc-ref status 'downloader-pid)) - (filename (uri-status-file-name status-dir - uri)) - (file (open-file filename "w"))) - - ;; Write down the status - (pretty-print status file) - (close-port file) - - ;; Wait for `gnunet-download' - (gnunet-info "Waiting for process ~a" pid) - (let* ((process-status (waitpid pid)) - (exit-val (status:exit-val (cdr process-status))) - (term-sig (status:term-sig (cdr process-status)))) - - ;; Terminate - (delete-file filename) - (gnunet-info - "Download completed (PID ~a, exit code ~a)" - pid exit-val) - (let ((ret `((end-date . ,(current-time)) - (exit-code . ,exit-val) - (terminating-signal . ,term-sig) - ,@status))) - (run-hook *completed-download-hook* ret) - ret)))) - (lambda (key . args) - (gnunet-error (exception-string key args))))) - -(define (uri-status-files directory) - "Return the list of URI status files in @var{directory}." - (catch 'system-error - (lambda () - (let ((dir (opendir directory))) - (let loop ((filename (readdir dir)) - (file-list '())) - (if (eof-object? filename) - file-list - (if (regexp-exec *uri-status-file-re* filename) - (loop (readdir dir) - (cons filename file-list)) - (loop (readdir dir) file-list)))))) - (lambda (key . args) - (gnunet-error (exception-string key args))))) - -(define (output-file-option option-list) - "Return the output file specified in @var{option-list}, false if -anavailable." - (if (null? option-list) - #f - (let ((rest (cdr option-list)) - (opt (car option-list))) - (if (null? rest) - #f - (if (or (string=? opt "-o") - (string=? opt "--output")) - (car rest) - (output-file-option rest)))))) - -(define (download-command . args) - "Start downloading a file using the given `gnunet-download' -arguments." - (gnunet-debug "download-command") - (let* ((argc (length args)) - ;; FIXME: We're assuming the URI is the last argument - (uri (car (list-tail args (- argc 1)))) - (options args)) - (download-file *gnunet-download* *status-directory* uri options))) - -(define (status-command . args) - "Print status info about files being downloaded." - (for-each (lambda (status) - (format #t "~a: ~a~% ~a~% ~a~% ~a~%" - (assoc-ref status 'uri) - (if (download-process-alive? status) - (string-append "running (PID " - (number->string (assoc-ref status - 'pid)) - ")") - "not running") - (string-append "Started on " - (strftime "%c" - (localtime (assoc-ref - status - 'start-date)))) - (string-append "Directory: " - (assoc-ref status - 'working-directory)) - (string-append "Output file: " - (or (output-file-option (assoc-ref - status - 'options)) - "<unknown>")))) - (map (lambda (file) - (uri-status *status-directory* - (string-append "gnunet://afs/" file))) - (uri-status-files *status-directory*)))) - -(define (resume-command . args) - "Resume stopped downloads." - (for-each (lambda (status) - (if (not (download-process-alive? status)) - (if (= 0 (primitive-fork)) - (let* ((ret (download-file *gnunet-download* - *status-directory* - (assoc-ref status 'uri) - (assoc-ref status 'options))) - (code (assoc-ref ret 'exit-code))) - (exit code))))) - (map (lambda (file) - (uri-status *status-directory* - (string-append "gnunet://afs/" file))) - (uri-status-files *status-directory*)))) - -(define (killall-command . args) - "Stop all running downloads." - (for-each (lambda (status) - (if (download-process-alive? status) - (let ((pid (assoc-ref status 'pid)) - (dl-pid (assoc-ref status 'downloader-pid))) - (and (gnunet-info "Stopping processes ~a and ~a" - pid dl-pid) - (kill pid 15) - (kill dl-pid 15))))) - (map (lambda (file) - (uri-status *status-directory* - (string-append "gnunet://afs/" file))) - (uri-status-files *status-directory*)))) - - -(define (help-command . args) - "Show this help message." - (format #t "Usage: ~a <command> [options]~%" *program-name*) - (format #t "Where <command> may be one of the following:~%~%") - (for-each (lambda (command) - (if (not (eq? (cdr command) help-command)) - (format #t (string-append " " (car command) ": " - (object-documentation - (cdr command)) - "~%")))) - *commands*) - (format #t "~%")) - -(define (settings-command . args) - "Dump the current settings." - (format #t "Current settings:~%~%") - (module-for-each (lambda (symbol variable) - (if (string-match "^\\*.*\\*$" (symbol->string symbol)) - (format #t " ~a: ~a~%" - symbol (variable-ref variable)))) - (current-module)) - (format #t "~%")) - -(define (version-command . args) - "Show version information." - (format #t "~a ~a.~a (~a)~%" - *program-name* *version-major* *version-minor* *version-date*)) - -;; This hook may be added to *completed-download-hook*. -(define (completed-download-notification-hook status) - "Notifies of the completion of a file download." - (let ((msg (string-append "GNUnet download of " - (output-file-option - (assoc-ref status 'options)) - " in " - (assoc-ref status - 'working-directory) - " complete!"))) - (if (getenv "DISPLAY") - (waitpid (fork-and-exec #f "xmessage" msg)) - (waitpid (fork-and-exec #f "write" - (cuserid) msg))))) - -;; Available user commands -(define *commands* - `(("download" . ,download-command) - ("status" . ,status-command) - ("resume" . ,resume-command) - ("killall" . ,killall-command) - ("settings" . ,settings-command) - ("version" . ,version-command) - ("help" . ,help-command) - ("--help" . ,help-command) - ("-h" . ,help-command))) - -(define *program-name* "gnunet-download-manager") -(define *version-major* 0) -(define *version-minor* 1) -(define *version-date* "april 2004") - -(define (main args) - (set! *program-name* (basename (car args))) - - ;; Load the user's configuration file - (if (file-exists? *rc-file*) - (load *rc-file*)) - - ;; Check whether the status directory already exists - (if (not (file-exists? *status-directory*)) - (begin - (gnunet-info "Creating status directory ~a..." *status-directory*) - (catch 'system-error - (lambda () - (mkdir *status-directory*)) - (lambda (key . args) - (and (gnunet-error (exception-string key args)) - (exit 1)))))) - - ;; Go ahead - (if (< (length args) 2) - (and (format #t "Usage: ~a <command> [options]~%" - *program-name*) - (exit 1)) - (let* ((command-name (cadr args)) - (command (assoc-ref *commands* command-name))) - (if command - (apply command (cddr args)) - (and (gnunet-info "~a command not found" command-name) - (exit 1))))))
\ No newline at end of file diff --git a/net-p2p/gnunet/files/gnunet-2 b/net-p2p/gnunet/files/gnunet.initd index 54e73a4c4d06..ffd010700e32 100644 --- a/net-p2p/gnunet/files/gnunet-2 +++ b/net-p2p/gnunet/files/gnunet.initd @@ -1,6 +1,6 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 depend() { need net @@ -15,7 +15,7 @@ start() { ebegin "Starting GNUnet" # -u username, -c path to gnunet.conf file start-stop-daemon --start --quiet --background --exec /usr/bin/gnunetd \ - -- -u gnunet -c /etc/gnunetd.conf + -- -u gnunetd -c /etc/gnunetd.conf eend $? "Failed to start GNUnet" } diff --git a/net-p2p/gnunet/gnunet-0.7.2c.ebuild b/net-p2p/gnunet/gnunet-0.7.2c-r1.ebuild index 847c49fcb870..e24a512174ed 100644 --- a/net-p2p/gnunet/gnunet-0.7.2c.ebuild +++ b/net-p2p/gnunet/gnunet-0.7.2c-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.2c.ebuild,v 1.3 2008/01/16 15:04:40 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.2c-r1.ebuild,v 1.1 2008/02/04 15:24:55 armin76 Exp $ inherit eutils autotools @@ -66,21 +66,13 @@ src_unpack() { src_compile() { local myconf - if use ipv6; then - if use amd64; then - ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled" - else - myconf="${myconf} --enable-ipv6" - fi - fi - use mysql || myconf="${myconf} --without-mysql" econf \ $(use_with sqlite) \ + $(use_enable ipv6) \ $(use_enable nls) \ $(use_enable ncurses) \ - $(use_enable guile) \ ${myconf} || die "econf failed" emake -j1 || die "emake failed" @@ -93,14 +85,14 @@ src_install() { newins contrib/gnunet.root gnunet.conf docinto contrib dodoc contrib/* - newinitd "${FILESDIR}"/${PN}-2 gnunet + newinitd "${FILESDIR}"/${PN}.initd gnunet dodir /var/lib/gnunet chown gnunetd:gnunetd "${D}"/var/lib/gnunet } pkg_postinst() { # make sure permissions are ok - chown -R gnunetd:gnunetd /var/lib/gnunet + chown -R gnunetd:gnunetd "${ROOT}"/var/lib/gnunet use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs" einfo diff --git a/net-p2p/gnunet/gnunet-0.7.3.ebuild b/net-p2p/gnunet/gnunet-0.7.3-r1.ebuild index 46be11929aa4..f4b7787eca02 100644 --- a/net-p2p/gnunet/gnunet-0.7.3.ebuild +++ b/net-p2p/gnunet/gnunet-0.7.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.3.ebuild,v 1.2 2008/01/16 15:04:40 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.3-r1.ebuild,v 1.1 2008/02/04 15:24:55 armin76 Exp $ inherit eutils autotools @@ -66,21 +66,13 @@ src_unpack() { src_compile() { local myconf - if use ipv6; then - if use amd64; then - ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled" - else - myconf="${myconf} --enable-ipv6" - fi - fi - use mysql || myconf="${myconf} --without-mysql" econf \ $(use_with sqlite) \ + $(use_enable ipv6) \ $(use_enable nls) \ $(use_enable ncurses) \ - $(use_enable guile) \ ${myconf} || die "econf failed" emake -j1 || die "emake failed" @@ -93,14 +85,14 @@ src_install() { newins contrib/gnunet.root gnunet.conf docinto contrib dodoc contrib/* - newinitd "${FILESDIR}"/${PN}-2 gnunet + newinitd "${FILESDIR}"/${PN}.initd gnunet dodir /var/lib/gnunet chown gnunetd:gnunetd "${D}"/var/lib/gnunet } pkg_postinst() { # make sure permissions are ok - chown -R gnunetd:gnunetd /var/lib/gnunet + chown -R gnunetd:gnunetd "${ROOT}"/var/lib/gnunet use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs" einfo |