diff options
author | Jon Hood <squinky86@gentoo.org> | 2004-06-29 01:25:10 +0000 |
---|---|---|
committer | Jon Hood <squinky86@gentoo.org> | 2004-06-29 01:25:10 +0000 |
commit | 5c4723a51311a1e52b7994493337d9f119e50a2c (patch) | |
tree | ed95e71afa691c1d6516c25b52eb58d6212263a8 | |
parent | QA: inherit kde-base -> inherit kde, newdepend -> DEPEND, need-kde after R/DE... (diff) | |
download | gentoo-2-5c4723a51311a1e52b7994493337d9f119e50a2c.tar.gz gentoo-2-5c4723a51311a1e52b7994493337d9f119e50a2c.tar.bz2 gentoo-2-5c4723a51311a1e52b7994493337d9f119e50a2c.zip |
many cleanups and version bumps, closes #55246
-rw-r--r-- | net-p2p/gnunet/ChangeLog | 11 | ||||
-rw-r--r-- | net-p2p/gnunet/Manifest | 4 | ||||
-rw-r--r-- | net-p2p/gnunet/files/digest-gnunet-0.5.5 | 1 | ||||
-rw-r--r-- | net-p2p/gnunet/files/digest-gnunet-0.6.1b | 1 | ||||
-rw-r--r-- | net-p2p/gnunet/files/digest-gnunet-0.6.1c | 1 | ||||
-rw-r--r-- | net-p2p/gnunet/files/digest-gnunet-0.6.2 | 1 | ||||
-rw-r--r-- | net-p2p/gnunet/files/digest-gnunet-0.6.2b | 1 | ||||
-rw-r--r-- | net-p2p/gnunet/files/gnunet-download-manager.scm | 407 | ||||
-rw-r--r-- | net-p2p/gnunet/gnunet-0.5.5.ebuild | 51 | ||||
-rw-r--r-- | net-p2p/gnunet/gnunet-0.6.1b.ebuild | 47 | ||||
-rw-r--r-- | net-p2p/gnunet/gnunet-0.6.1c.ebuild | 64 | ||||
-rw-r--r-- | net-p2p/gnunet/gnunet-0.6.2a.ebuild | 6 | ||||
-rw-r--r-- | net-p2p/gnunet/gnunet-0.6.2b.ebuild (renamed from net-p2p/gnunet/gnunet-0.6.2.ebuild) | 10 |
13 files changed, 432 insertions, 173 deletions
diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog index c4d1d7baac71..574479c8892e 100644 --- a/net-p2p/gnunet/ChangeLog +++ b/net-p2p/gnunet/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-p2p/gnunet # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.25 2004/06/25 00:33:04 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.26 2004/06/29 01:25:10 squinky86 Exp $ + +*gnunet-0.6.2b (28 Jun 2004) + + 28 Jun 2004; Jon Hood <squinky86@gentoo.org> + +files/gnunet-download-manager.scm, -gnunet-0.5.5.ebuild, + -gnunet-0.6.1b.ebuild, -gnunet-0.6.1c.ebuild, -gnunet-0.6.2.ebuild, + gnunet-0.6.2a.ebuild, +gnunet-0.6.2b.ebuild: + version bump, thanks to Jon Lund Steffensen <jonls@users.sourceforge.net> in + #55246 *gnunet-0.6.2a (12 May 2004) diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest index 4dfc6a28e0b9..5705b72604da 100644 --- a/net-p2p/gnunet/Manifest +++ b/net-p2p/gnunet/Manifest @@ -1,7 +1,8 @@ MD5 2f9b0b40423fd7172b7e21bbc570cb2f gnunet-0.5.5.ebuild 1250 +MD5 3f1fe94a583b99c20e7de2038bb967d0 gnunet-0.6.2b.ebuild 1466 MD5 46f68b9682d5bd3312dc2c2b9bd5845f gnunet-0.6.1c.ebuild 1460 MD5 4f9226f4408ff37f868a8367513e9c56 gnunet-0.5.4-r1.ebuild 1260 -MD5 661bbbeac745d3e8c5820701b06bb0b9 gnunet-0.6.2a.ebuild 1465 +MD5 3f1fe94a583b99c20e7de2038bb967d0 gnunet-0.6.2a.ebuild 1466 MD5 2becb7b8f87e60aa4e93581150ef0b3f gnunet-0.6.1b.ebuild 1189 MD5 c59944adbf4cca997e107e3a17a7b4da gnunet-0.6.2.ebuild 1464 MD5 19352b3822254ddb2d565dab1ec86f1c ChangeLog 3941 @@ -9,6 +10,7 @@ MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160 MD5 7497a53319c18a07e6f673a925b1bf8c files/digest-gnunet-0.6.1b 67 MD5 99094e50a9e664c0f98757ec36e1b5fe files/digest-gnunet-0.6.1c 67 MD5 974a5b99dd02348e2111e88749e1e580 files/digest-gnunet-0.6.2a 67 +MD5 d4a748c8e3536c6691b63794f7c17639 files/digest-gnunet-0.6.2b 66 MD5 c9f162707edf3372ba994a5d274c1280 files/digest-gnunet-0.5.5 65 MD5 0e1a9b825d565da6bcddd0167198bcb2 files/digest-gnunet-0.6.2 66 MD5 d628356df7b12ee797cbd14ac6918610 files/gnunet 947 diff --git a/net-p2p/gnunet/files/digest-gnunet-0.5.5 b/net-p2p/gnunet/files/digest-gnunet-0.5.5 deleted file mode 100644 index ae8b98053474..000000000000 --- a/net-p2p/gnunet/files/digest-gnunet-0.5.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 9cf47ded8472e73ec7d0c17d930d17e2 GNUnet-0.5.5.tar.bz2 829369 diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.1b b/net-p2p/gnunet/files/digest-gnunet-0.6.1b deleted file mode 100644 index 359baa124507..000000000000 --- a/net-p2p/gnunet/files/digest-gnunet-0.6.1b +++ /dev/null @@ -1 +0,0 @@ -MD5 3a215e44a6fd4c7839db9c505f0209a9 GNUnet-0.6.1b.tar.bz2 1062223 diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.1c b/net-p2p/gnunet/files/digest-gnunet-0.6.1c deleted file mode 100644 index dcbdf86f51d4..000000000000 --- a/net-p2p/gnunet/files/digest-gnunet-0.6.1c +++ /dev/null @@ -1 +0,0 @@ -MD5 b5eaac27b1ba018f4560f5a17e2f049f GNUnet-0.6.1c.tar.bz2 1078225 diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.2 b/net-p2p/gnunet/files/digest-gnunet-0.6.2 deleted file mode 100644 index d8e37f9c36d8..000000000000 --- a/net-p2p/gnunet/files/digest-gnunet-0.6.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 f53c9e17fcece9781f1e81eb5fb816a5 GNUnet-0.6.2.tar.bz2 1057957 diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.2b b/net-p2p/gnunet/files/digest-gnunet-0.6.2b new file mode 100644 index 000000000000..32ea08b194a3 --- /dev/null +++ b/net-p2p/gnunet/files/digest-gnunet-0.6.2b @@ -0,0 +1 @@ +MD5 c3c8dcc940d3fdf35c0f606624362938 GNUnet-0.6.2b.tar.bz2 980714 diff --git a/net-p2p/gnunet/files/gnunet-download-manager.scm b/net-p2p/gnunet/files/gnunet-download-manager.scm new file mode 100644 index 000000000000..80d04fa129fb --- /dev/null +++ b/net-p2p/gnunet/files/gnunet-download-manager.scm @@ -0,0 +1,407 @@ +#!/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/gnunet-0.5.5.ebuild b/net-p2p/gnunet/gnunet-0.5.5.ebuild deleted file mode 100644 index ffa223b7f63e..000000000000 --- a/net-p2p/gnunet/gnunet-0.5.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.5.5.ebuild,v 1.6 2004/06/25 00:33:04 agriffis Exp $ - -inherit libtool - -S="${WORKDIR}/GNUnet-${PV}" -DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network." -HOMEPAGE="http://www.gnu.org/software/GNUnet/" -SRC_URI="mirror://gnu/${PN}/GNUnet-${PV}.tar.bz2" -RESTRICT="nomirror" - -IUSE="ipv6" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86" - -DEPEND=">=dev-libs/openssl-0.9.6d - >=sys-libs/gdbm-1.8.0 - =dev-libs/glib-1.2* - =x11-libs/gtk+-1.2* - >=media-libs/libextractor-0.2.5" - - -src_compile () { - elibtoolize - local myconf - use ipv6 && myconf="--enable-ipv6" || myconf=" --disable-ipv6" - econf ${myconf} || die "econf failed" - make || die -} - -src_install () { - make DESTDIR=${D} install || die - dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README - - dodir /etc - cp contrib/gnunet.conf.root ${D}/etc/gnunet.conf - docinto contrib - dodoc contrib/* -} - -pkg_postinst() { - use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bug" - einfo "" - einfo "now copy an appropriate config file from" - einfo "/usr/share/doc/${P}/contrib" - einfo "to ~/.gnunet/gnunet.conf" - einfo "" -} diff --git a/net-p2p/gnunet/gnunet-0.6.1b.ebuild b/net-p2p/gnunet/gnunet-0.6.1b.ebuild deleted file mode 100644 index 23e8f094cb66..000000000000 --- a/net-p2p/gnunet/gnunet-0.6.1b.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.1b.ebuild,v 1.4 2004/06/25 00:33:04 agriffis Exp $ - -inherit libtool - -S="${WORKDIR}/GNUnet-${PV}" -DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network." -HOMEPAGE="http://www.gnu.org/software/GNUnet/" -SRC_URI="mirror://gnu/${PN}/GNUnet-${PV}.tar.bz2" -RESTRICT="nomirror" - -IUSE="ipv6" - -KEYWORDS="~x86" -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=dev-libs/openssl-0.9.6d - >=sys-libs/gdbm-1.8.0 - =dev-libs/glib-1.2* - =x11-libs/gtk+-1.2* - >=media-libs/libextractor-0.2.6" - -src_compile() { - elibtoolize - econf `use_enable ipv6` || die - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - dodoc AUTHORS ChangeLog PLATFORMS README UPDATING - insinto /etc - newins contrib/gnunet.conf.root gnunet.conf - docinto contrib - dodoc contrib/* -} - -pkg_postinst() { - use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bug" - einfo - einfo "now copy an appropriate config file from" - einfo "/usr/share/doc/${P}/contrib" - einfo "to ~/.gnunet/gnunet.conf" - einfo -} diff --git a/net-p2p/gnunet/gnunet-0.6.1c.ebuild b/net-p2p/gnunet/gnunet-0.6.1c.ebuild deleted file mode 100644 index d148f8c65edf..000000000000 --- a/net-p2p/gnunet/gnunet-0.6.1c.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.1c.ebuild,v 1.4 2004/06/25 00:33:04 agriffis Exp $ - -inherit libtool - -S="${WORKDIR}/GNUnet-${PV}" -DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network." -HOMEPAGE="http://www.gnu.org/software/GNUnet/" -SRC_URI="mirror://gnu/${PN}/GNUnet-${PV}.tar.bz2" -RESTRICT="nomirror" - -IUSE="ipv6 gtk crypt mysql" - -KEYWORDS="~x86" -LICENSE="GPL-2" -SLOT="0" - -DEPEND=">=dev-libs/openssl-0.9.6d - >=sys-libs/gdbm-1.8.0 - crypt? ( dev-libs/libgcrypt ) - gtk? ( =x11-libs/gtk+-1.2* ) - mysql? ( dev-db/mysql ) - >=media-libs/libextractor-0.2.6" - -src_compile() { - elibtoolize - - local myconf - - if ! use gtk; then - myconf="${myconf} --without-gtk" - fi - - if ! use crypt; then - myconf="${myconf} --without-gcrypt" - fi - - if ! use mysql; then - myconf="${myconf} --without-mysql" - fi - - econf ${myconf} `use_enable ipv6` || die - - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die "make install failed" - dodoc AUTHORS ChangeLog PLATFORMS README UPDATING - insinto /etc - newins contrib/gnunet.root gnunet.conf - docinto contrib - dodoc contrib/* -} - -pkg_postinst() { - use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bug" - einfo - einfo "now copy an appropriate config file from" - einfo "/usr/share/doc/${P}/contrib" - einfo "to ~/.gnunet/gnunet.conf" - einfo -} diff --git a/net-p2p/gnunet/gnunet-0.6.2a.ebuild b/net-p2p/gnunet/gnunet-0.6.2a.ebuild index 9234f260e268..9705b3ab83ee 100644 --- a/net-p2p/gnunet/gnunet-0.6.2a.ebuild +++ b/net-p2p/gnunet/gnunet-0.6.2a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.2a.ebuild,v 1.2 2004/06/25 00:33:04 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.2a.ebuild,v 1.3 2004/06/29 01:25:10 squinky86 Exp $ inherit libtool @@ -12,7 +12,7 @@ RESTRICT="nomirror" IUSE="ipv6 gtk crypt mysql" -KEYWORDS="~x86 ~ppc" +KEYWORDS="x86 ~ppc" LICENSE="GPL-2" SLOT="0" @@ -55,7 +55,7 @@ src_install() { } pkg_postinst() { - use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bug" + use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs" einfo einfo "now copy an appropriate config file from" einfo "/usr/share/doc/${P}/contrib" diff --git a/net-p2p/gnunet/gnunet-0.6.2.ebuild b/net-p2p/gnunet/gnunet-0.6.2b.ebuild index 2b63af20e90d..5722ac9181d6 100644 --- a/net-p2p/gnunet/gnunet-0.6.2.ebuild +++ b/net-p2p/gnunet/gnunet-0.6.2b.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.2.ebuild,v 1.5 2004/06/25 00:33:04 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.2b.ebuild,v 1.1 2004/06/29 01:25:10 squinky86 Exp $ inherit libtool @@ -23,6 +23,12 @@ DEPEND=">=dev-libs/openssl-0.9.6d mysql? ( dev-db/mysql ) >=media-libs/libextractor-0.3.1" +src_unpack() { + unpack ${A} + cp ${FILESDIR}/gnunet-download-manager.scm ${S}/contrib/ + cd ${S} +} + src_compile() { elibtoolize @@ -55,7 +61,7 @@ src_install() { } pkg_postinst() { - use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bug" + use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs" einfo einfo "now copy an appropriate config file from" einfo "/usr/share/doc/${P}/contrib" |