[gentoo-commits] proj/lisp:master commit in: dev-lisp/cl-graph/files/, dev-lisp/cl-graph/

[José María Alonso]

commit:     5b3fcd0d14ef13c97f049565c12a8d1ddf281712
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 22:47:28 2016 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 22:47:28 2016 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=5b3fcd0d

dev-lisp/cl-graph: Updates header, EAPI and SRC_URI

 dev-lisp/cl-graph/cl-graph-0.10.2.ebuild           | 27 +++++++++------
 ...x-deps.patch => cl-graph-0.10.2-fix-deps.patch} | 40 +++++++++++-----------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/dev-lisp/cl-graph/cl-graph-0.10.2.ebuild b/dev-lisp/cl-graph/cl-graph-0.10.2.ebuild
index f2c271b..bf7dff9 100644
--- a/dev-lisp/cl-graph/cl-graph-0.10.2.ebuild
+++ b/dev-lisp/cl-graph/cl-graph-0.10.2.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
-inherit common-lisp-2 eutils
+EAPI=6
+
+inherit common-lisp-3 eutils
+
+MY_PV="version-${PV}"
 
 DESCRIPTION="Graph manipulation utilities for Common Lisp."
 HOMEPAGE="http://common-lisp.net/project/cl-graph"
-SRC_URI="http://common-lisp.net/~sionescu/files/${P}.tar.bz2"
+SRC_URI="https://github.com/gwkkwg/${PN}/archive/${MY_PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
+IUSE="doc"
 
 RDEPEND="dev-lisp/asdf-system-connections
 		>=dev-lisp/metatilities-base-0.6.0
@@ -22,13 +26,16 @@ RDEPEND="dev-lisp/asdf-system-connections
 
 CLSYSTEMS="${PN} ${PN}-test"
 
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}"/fix-deps.patch
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-deps.patch
+	default
 }
 
 src_install() {
-	common-lisp-install *.asd dev/{*.lisp,graphviz} unit-tests
-	common-lisp-symlink-asdf
+	common-lisp-install-sources dev/{*.lisp,graphviz} unit-tests
+	common-lisp-install-asdf
+	use doc && dodoc -r website
 	docinto examples && dodoc dev/examples/*
 }

diff --git a/dev-lisp/cl-graph/files/fix-deps.patch b/dev-lisp/cl-graph/files/cl-graph-0.10.2-fix-deps.patch
similarity index 50%
rename from dev-lisp/cl-graph/files/fix-deps.patch
rename to dev-lisp/cl-graph/files/cl-graph-0.10.2-fix-deps.patch
index fbcfa1a..bd639c3 100644
--- a/dev-lisp/cl-graph/files/fix-deps.patch
+++ b/dev-lisp/cl-graph/files/cl-graph-0.10.2-fix-deps.patch
@@ -3,22 +3,22 @@ Date: 2008-10-28
 Status: Gentoo-only
 Description: Add hard dep on moptilities and include subgraph-containing in main system
 
-diff -Naur cl-graph-0.10.2.orig/cl-graph.asd cl-graph-0.10.2/cl-graph.asd
---- cl-graph-0.10.2.orig/cl-graph.asd	2008-10-28 16:22:05.000000000 +0100
-+++ cl-graph-0.10.2/cl-graph.asd	2008-10-28 16:45:46.000000000 +0100
-@@ -32,8 +32,10 @@
-                         :depends-on ("graph"))
-                  (:file "graph-matrix"
-                         :depends-on ("graph"))
--                 (:file "graph-algorithms"
-+                 (:file "subgraph-containing"
-                         :depends-on ("graph"))
-+                 (:file "graph-algorithms"
-+                        :depends-on ("graph" "subgraph-containing"))
-                  (:module "graphviz" :depends-on ("graph")
-                           :components ((:file "graphviz-support"))))))
-   :in-order-to ((test-op (load-op :cl-graph-test)))
-@@ -42,8 +44,10 @@
+diff -Nuar a/cl-graph.asd b/cl-graph.asd
+--- a/cl-graph.asd	2008-10-27 02:00:50.000000000 +0100
++++ b/cl-graph.asd	2016-12-01 23:35:27.710005029 +0100
+@@ -33,8 +33,10 @@
+ 			:depends-on ("graph"))
+ 		 (:file "graph-matrix"
+ 			:depends-on ("graph"))
+-		 (:file "graph-algorithms"
++		 (:file "subgraph-containing"
+ 			:depends-on ("graph"))
++		 (:file "graph-algorithms"
++		    :depends-on ("graph" "subgraph-containing"))
+                                      
+ 		 (:static-file "notes.text")
+ 
+@@ -51,8 +53,10 @@
  		      (intern (symbol-name '#:run-tests) :lift)
  		      :config :generic))
    :depends-on ((:version :metatilities-base "0.6.0")
@@ -29,15 +29,15 @@ diff -Naur cl-graph-0.10.2.orig/cl-graph.asd cl-graph-0.10.2/cl-graph.asd
 +               (:version :cl-containers "0.11.0")
 +               ))
  
- (defmethod operation-done-p
+ (defmethod operation-done-p 
             ((o test-op) (c (eql (find-system 'cl-graph))))
-@@ -85,14 +89,6 @@
+@@ -94,14 +98,6 @@
  		((:file "graph-metrics")))))
  
  #+asdf-system-connections
 -(asdf:defsystem-connection cl-graph-and-moptilities
 -  :requires (cl-graph moptilities)
--  :components ((:module
+-  :components ((:module 
 -		"dev"
 -		:components
 -		((:file "subgraph-containing")))))
@@ -45,4 +45,4 @@ diff -Naur cl-graph-0.10.2.orig/cl-graph.asd cl-graph-0.10.2/cl-graph.asd
 -#+asdf-system-connections
  (asdf:defsystem-connection cl-graph-and-dynamic-classes
    :requires (cl-graph dynamic-classes)
-   :components ((:module
+   :components ((:module