Closing bug #98032. thx Carsten Lohrke

(Portage version: 2.0.51.19)

9 files changed, 9 insertions, 183 deletions

diff --git a/dev-util/cogito/ChangeLog b/dev-util/cogito/ChangeLog
index b8c7294b6fbb..f440e5c8573a 100644
--- a/dev-util/cogito/ChangeLog
+++ b/dev-util/cogito/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for dev-util/cogito
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cogito/ChangeLog,v 1.9 2005/07/13 00:02:27 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cogito/ChangeLog,v 1.10 2005/07/15 17:55:50 r3pek Exp $
+
+  15 Jul 2005; Carlos Silva <r3pek@gentoo.org> -files/Makefile.patch,
+  -files/git-rev-list.patch, -cogito-0.10.ebuild, -cogito-0.11.1.ebuild,
+  -cogito-0.11.3.ebuild, cogito-0.12.1.ebuild:
+  Closing bug #98032. thx Carsten Lohrke
 
 *cogito-0.12.1 (13 Jul 2005)
 
-  13 Jul 2005; Michał Januszewski <spock@gentoo.org> +cogito-0.12.1.ebuild:
+  13 Jul 2005; Michał Januszewski <spock@gentoo.org> +cogito-0.12.1.ebuild:
   Version bump.
 
   01 Jul 2005; Carlos Silva <r3pek@gentoo.org> +files/git-rev-list.patch,
diff --git a/dev-util/cogito/cogito-0.10.ebuild b/dev-util/cogito/cogito-0.10.ebuild
deleted file mode 100644
index 428bf9396061..000000000000
--- a/dev-util/cogito/cogito-0.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cogito/cogito-0.10.ebuild,v 1.2 2005/05/17 22:26:14 r3pek Exp $
-
-inherit eutils
-
-DESCRIPTION="The GIT scripted toolkit"
-HOMEPAGE="http://kernel.org/pub/software/scm/cogito/"
-SRC_URI="http://kernel.org/pub/software/scm/cogito/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="mozsha1 ppcsha1"
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib
-	!dev-util/git"
-RDEPEND="net-misc/rsync
-		app-text/rcs
-		net-misc/curl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/Makefile.patch
-	sed -i \
-		-e "/^CFLAGS/s:-g -O2:${CFLAGS}:" \
-		Makefile
-}
-
-src_compile() {
-	if use mozsha1 ; then
-		export MOZILLA_SHA1=yes
-	elif use ppcsha1 ; then
-		export PPC_SHA1=yes
-	fi
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	dodoc README*
-}
diff --git a/dev-util/cogito/cogito-0.11.1.ebuild b/dev-util/cogito/cogito-0.11.1.ebuild
deleted file mode 100644
index 9ec5ff14c3fa..000000000000
--- a/dev-util/cogito/cogito-0.11.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cogito/cogito-0.11.1.ebuild,v 1.2 2005/06/13 16:55:44 ferdy Exp $
-
-inherit eutils
-
-DESCRIPTION="The GIT scripted toolkit"
-HOMEPAGE="http://kernel.org/pub/software/scm/cogito/"
-SRC_URI="http://kernel.org/pub/software/scm/cogito/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="mozsha1 ppcsha1 doc"
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib
-	!dev-util/git
-	doc? ( app-text/asciidoc app-text/xmlto )"
-
-RDEPEND="net-misc/rsync
-		app-text/rcs
-		net-misc/curl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "/^CFLAGS/s:-g -O2:${CFLAGS}:" \
-		-e "/^prefix?/s:\$(HOME):/usr:" \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	if use mozsha1 ; then
-		export MOZILLA_SHA1=yes
-	elif use ppcsha1 ; then
-		export PPC_SHA1=yes
-	fi
-
-	emake || die "emake failed"
-
-	if use doc; then
-		cd ${S}/Documentation
-		make || die "make documentation failed"
-	fi
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	dodoc README*
-	doman Documentation/*.1 Documentation/*.7
-}
diff --git a/dev-util/cogito/cogito-0.11.3.ebuild b/dev-util/cogito/cogito-0.11.3.ebuild
deleted file mode 100644
index 3263548294f0..000000000000
--- a/dev-util/cogito/cogito-0.11.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cogito/cogito-0.11.3.ebuild,v 1.3 2005/07/01 13:08:06 r3pek Exp $
-
-inherit eutils
-
-DESCRIPTION="The GIT scripted toolkit"
-HOMEPAGE="http://kernel.org/pub/software/scm/cogito/"
-SRC_URI="http://kernel.org/pub/software/scm/cogito/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="mozsha1 ppcsha1 doc"
-
-DEPEND="dev-libs/openssl
-	sys-libs/zlib
-	!dev-util/git
-	doc? ( app-text/asciidoc app-text/xmlto )"
-
-RDEPEND="net-misc/rsync
-		app-text/rcs
-		net-misc/curl"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/git-rev-list.patch
-	cd "${S}"
-	sed -i \
-		-e "/^CFLAGS/s:-g -O2:${CFLAGS}:" \
-		-e "/^prefix?/s:\$(HOME):/usr:" \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	if use mozsha1 ; then
-		export MOZILLA_SHA1=yes
-	elif use ppcsha1 ; then
-		export PPC_SHA1=yes
-	fi
-
-	emake || die "emake failed"
-
-	if use doc; then
-		cd ${S}/Documentation
-		make || die "make documentation failed"
-	fi
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	dodoc README*
-	doman Documentation/*.1 Documentation/*.7
-}
diff --git a/dev-util/cogito/cogito-0.12.1.ebuild b/dev-util/cogito/cogito-0.12.1.ebuild
index 71c72fb628d9..810f2f0c7d43 100644
--- a/dev-util/cogito/cogito-0.12.1.ebuild
+++ b/dev-util/cogito/cogito-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cogito/cogito-0.12.1.ebuild,v 1.1 2005/07/13 00:02:27 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cogito/cogito-0.12.1.ebuild,v 1.2 2005/07/15 17:55:50 r3pek Exp $
 
 inherit eutils
 
@@ -16,6 +16,7 @@ IUSE="mozsha1 ppcsha1 doc"
 DEPEND="dev-libs/openssl
 	sys-libs/zlib
 	!dev-util/git
+	!app-misc/git
 	doc? ( app-text/asciidoc app-text/xmlto )"
 
 RDEPEND="net-misc/rsync
diff --git a/dev-util/cogito/files/Makefile.patch b/dev-util/cogito/files/Makefile.patch
deleted file mode 100644
index 835def813df9..000000000000
--- a/dev-util/cogito/files/Makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Makefile: needs update
-Index: Makefile
-===================================================================
---- 3974261da777f55a7a11aff6e02f584bbfe2b475/Makefile  (mode:100644)
-+++ uncommitted/Makefile  (mode:100644)
-@@ -25,7 +25,7 @@
- CFLAGS+=-Wall $(DEFINES)
- 
- # Should be changed to /usr/local
--prefix?=$(HOME)
-+prefix?=/usr
- 
- bindir?=$(prefix)/bin
- libdir?=$(prefix)/lib/cogito
diff --git a/dev-util/cogito/files/digest-cogito-0.10 b/dev-util/cogito/files/digest-cogito-0.10
deleted file mode 100644
index e5635f1e28e3..000000000000
--- a/dev-util/cogito/files/digest-cogito-0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5bce32ffd5c7de01fb4785b44a48b11d cogito-0.10.tar.bz2 89000
diff --git a/dev-util/cogito/files/digest-cogito-0.11.1 b/dev-util/cogito/files/digest-cogito-0.11.1
deleted file mode 100644
index c8d669a2be99..000000000000
--- a/dev-util/cogito/files/digest-cogito-0.11.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 14a8e24b776675ca39cb2ae23bf4e077 cogito-0.11.1.tar.bz2 156021
diff --git a/dev-util/cogito/files/git-rev-list.patch b/dev-util/cogito/files/git-rev-list.patch
deleted file mode 100644
index 9ba45cb8ff8c..000000000000
--- a/dev-util/cogito/files/git-rev-list.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uar cogito-0.11.3.orig/rev-list.c cogito-0.11.3/rev-list.c
---- cogito-0.11.3.orig/rev-list.c	2005-06-30 11:21:57.329236026 +0400
-+++ cogito-0.11.3/rev-list.c	2005-06-30 11:22:28.229252742 +0400
-@@ -218,7 +218,7 @@
- 			list = limit_list(list);
- 		show_commit_list(list);
- 	} else {
--#ifdef NO_OPENSSL
-+#ifndef NO_OPENSSL
- 		if (sort_list_in_merge_order(list, &process_commit)) {
- 			  die("merge order sort failed\n");
- 		}