Version bump, go manual install since the upstream one sucks so much.

Package-Manager: portage-2.1.4.4

3 files changed, 116 insertions, 3 deletions

diff --git a/net-libs/cvm/ChangeLog b/net-libs/cvm/ChangeLog
index 2c9d89a8bd4c..05e5836a5306 100644
--- a/net-libs/cvm/ChangeLog
+++ b/net-libs/cvm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/cvm
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cvm/ChangeLog,v 1.18 2006/11/23 20:01:22 vivo Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cvm/ChangeLog,v 1.19 2008/02/27 03:55:08 robbat2 Exp $
+
+  27 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> +cvm-0.82.ebuild:
+  Version bump, go manual install since the upstream one sucks so much.
+
+*cvm-0.82 (27 Feb 2008)
+
+  27 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> +cvm-0.82.ebuild:
+  Version bump.
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> cvm-0.32-r1.ebuild,
   cvm-0.76.ebuild:
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 9c56356cdd08..7b5e404ebcd3 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,9 +1,11 @@
 DIST cvm-0.18.tar.gz 45525 RMD160 9d48cae26f1bdddffc20cbf557b346a0134534e2 SHA1 0594eb492d6800e30daf53b6f1d5a7b08c3c9f55 SHA256 77a3b10d83b43a766a3bde38fc17243fb3a25616461c8e0edc86258101fddae6
 DIST cvm-0.32.tar.gz 71231 RMD160 4e511516e75faa99da6e740b13d9045a1e52f7ab SHA1 9ee7dbfdac0f7999e6ac7385606fb3d8453dd440 SHA256 fdfca6e767c507269c65b0873fce88f371b32e0d6b002a0cacac646c75e701a5
 DIST cvm-0.76.tar.gz 91957 RMD160 d25f579ecbbb378099ca0375a50c176273c26a80 SHA1 652aec4ff9f7e7a66c50c6ea71494d5c1c43ca3f SHA256 0b0bbc21ad7bbe6acab66a85369502c2907e522fa2fd5c33c6f584ad1ccc000e
+DIST cvm-0.82.tar.gz 93615 RMD160 3c46e49514bebd3d89a557f95cbaf45884d1376e SHA1 ee66c6b987655fc9c43fe303cf339dd7d4a7dfae SHA256 5c209c2ac911ba5473b1ef1b78407afa6821eca26de476291a7362fee616d0fe
 EBUILD cvm-0.18.ebuild 1282 RMD160 aa9572a164cf18b588e6ad377474e2c5fdf1e6ad SHA1 6b9f7a8c178584efbb0caa58c7421233123d2d59 SHA256 7e72fcfe14e35b9a808bf0086f9047f8be0f677b2be82674156f84a2b8df2366
 EBUILD cvm-0.32-r1.ebuild 1184 RMD160 e4d2b591040962f843c75c9c1d09845ead35a058 SHA1 40f6be63597d615c2fbd7e67b900a481e67370d6 SHA256 db481361418179cdd60bf9ab4915f9931f359e85f73e6610f63e37ac6aac98bb
 EBUILD cvm-0.32.ebuild 1209 RMD160 7f44466b29539edbc3c34f67d88efa4c9f9a2805 SHA1 808cc7975722a532780bc114a80cbc936e1ba3c9 SHA256 873ed1251bf598364b513f57a41e703ff9f0a8d445731de0b4b2278f10de8827
 EBUILD cvm-0.76.ebuild 1558 RMD160 081ecd619b15fb165e5e3cc54a3f896ddd59a465 SHA1 0d4d6c0f700bdd21e0b4e481009d5b0090f0b2de SHA256 138da6d5f847bd9e29680ae2405aa03bba923fcaf20e0b3584f9ca509cfd726a
-MISC ChangeLog 2212 RMD160 1167760a3aa99726c00a5285d12a0147fe3b6bcc SHA1 b63bc156a454d8ebed9ed988817212d95d70dd99 SHA256 e486850b528234a4de13f75caa45a78fc5284547cc82a420fd0be9a5c89b6034
+EBUILD cvm-0.82.ebuild 3053 RMD160 4bf56f0658eb667f667a025dba57d062db6c5449 SHA1 3b7580eb70d4539878c68074f1eeb045205f2e86 SHA256 ea423f73a2063d7a54f6d87994b9c9599199e6036a298c4aeb254b4f3af2bb01
+MISC ChangeLog 2472 RMD160 72da86762538b25bc4513bd8d6550adc9fef0e0f SHA1 195e5a2a83cc2906a86e09f394ab0d67fe3191bf SHA256 7802a97c98ea73b6dc327033c55a8420aba320bf07571bc3762f8f82ac2b823f
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/net-libs/cvm/cvm-0.82.ebuild b/net-libs/cvm/cvm-0.82.ebuild
new file mode 100644
index 000000000000..14bb2a62b5d3
--- /dev/null
+++ b/net-libs/cvm/cvm-0.82.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cvm/cvm-0.82.ebuild,v 1.1 2008/02/27 03:55:08 robbat2 Exp $
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Credential Validation Modules by Bruce Guenter"
+HOMEPAGE="http://untroubled.org/cvm/"
+SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
+IUSE="mysql postgres test vpopmail"
+
+RDEPEND="virtual/libc
+		dev-db/cdb"
+DEPEND="${RDEPEND}
+		>=dev-libs/bglibs-1.041
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql )
+		vpopmail? ( net-mail/vpopmail )
+		test? ( app-editors/vim )"
+# some of the testcases use ex/vi/xxd
+
+src_unpack() {
+	unpack ${A}
+	# disable this test, as it breaks under Portage
+	# and there is no easy fix
+	sed -i.orig \
+		-e '/qmail-lookup-nodomain/,/^END_OF_TEST_RESULTS/d' \
+		"${S}"/tests.sh || die "sed failed"
+	# Fix the vpopmail build
+	sed -i.orig \
+		-e '/.\/ltload cvm-vchkpw/s,-lmysqlclient,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,-L/usr/local/vpopmail/lib,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,-L/var/vpopmail/lib,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,-L/usr/local/lib/mysql,,g' \
+		-e '/.\/ltload cvm-vchkpw/s,\.la,.la `cat /var/vpopmail/etc/lib_deps`,g' \
+		"${S}"/Makefile \
+		|| die "Failed to fix vpopmail linking parts of Makefile"
+	sed -i.orig \
+		-e '/.\/compile cvm-vchkpw/s,$, `cat /var/vpopmail/etc/inc_deps`,g' \
+		"${S}"/Makefile \
+		|| die "Failed to fix vpopmail compiling parts of Makefile"
+}
+
+src_compile() {
+	echo "/usr/include/bglibs" > conf-bgincs
+	echo "/usr/lib/bglibs" > conf-bglibs
+	echo "/usr/include" > conf-include
+	echo "/usr/lib" > conf-lib
+	echo "/usr/bin" > conf-bin
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld
+	emake || die
+
+	if use mysql; then
+		einfo "Building MySQL support"
+		emake mysql || die "making mysql support failed"
+	fi
+
+	if use postgres; then
+		einfo "Building Postgresql support"
+		emake pgsql || die "making postgres support failed"
+	fi
+
+	if use vpopmail; then
+		einfo "Building vpopmail support"
+		emake cvm-vchkpw || die "making vpopmail support failed"
+	fi
+}
+
+src_install() {
+	# Upstreams installer is incredibly broken
+	dolib .libs/*.a .libs/*.so.*
+	for i in a so ; do
+		dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i}
+	done
+
+	for i in {bench,test}client chain checkpassword pwfile qmail unix \
+			vmailmgr{,-local,-udp} v1{benchclient,checkpassword,testclient} \
+			; do
+			dobin .libs/cvm-${i}
+	done
+	use mysql && dobin .libs/cvm-mysql{,-local,-udp}
+	use postgres && dobin .libs/cvm-pgsql{,-local,-udp}
+	use vpopmail && dobin .libs/cvm-vchkpw
+
+	insinto /usr/include/cvm
+	doins {credentials,errors,facts,module,protocol,sasl,v1client,v2client}.h
+	dosym v1client.h /usr/include/cvm/client.h
+	dosym cvm/sasl.h /usr/include/cvm-sasl.h
+
+	dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr}
+	dodoc README{,.vchkpw,.vmailmgr}
+	dodoc TODO VERSION ChangeLog*
+	dohtml *.html
+}
+
+src_test() {
+	sh tests.sh || die "Testing Failed"
+}