Added am-utils-6.0.10 closing bug #89334

Package-Manager: portage-2.0.51.22-r1

5 files changed, 142 insertions, 3 deletions

diff --git a/net-fs/am-utils/ChangeLog b/net-fs/am-utils/ChangeLog
index ef3b99e9ef56..f77710a4a3c0 100644
--- a/net-fs/am-utils/ChangeLog
+++ b/net-fs/am-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/am-utils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/am-utils/ChangeLog,v 1.11 2005/06/06 23:31:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/am-utils/ChangeLog,v 1.12 2005/06/07 19:36:40 griffon26 Exp $
+
+*am-utils-6.0.10 (07 Jun 2005)
+
+  07 Jun 2005; Maurice van der Pot <griffon26@gentoo.org>
+  +files/am-utils-6.0.10-parallel-build.patch, +am-utils-6.0.10.ebuild:
+  Added new version 6.0.10 with a patch that enables parallel build.
+  Closes bug #89334 submitted by Daniel Webert <rockoo@gmail.com>
 
   06 Jun 2005; Mike Frysinger <vapier@gentoo.org> am-utils-6.0.9-r1.ebuild:
   Disable parallel build since it doesnt work #67136.
diff --git a/net-fs/am-utils/Manifest b/net-fs/am-utils/Manifest
index 73f23fb0aac8..fa202e2a01b9 100644
--- a/net-fs/am-utils/Manifest
+++ b/net-fs/am-utils/Manifest
@@ -1,8 +1,21 @@
-MD5 6a01dd8f79030594454e91155bc7f98e ChangeLog 1478
-MD5 fa659c8f7e566979ef1f007f83684f43 am-utils-6.0.9-r1.ebuild 1050
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 a3dd8511b8874ce1b494dce2472c709c metadata.xml 159
+MD5 fa659c8f7e566979ef1f007f83684f43 am-utils-6.0.9-r1.ebuild 1050
+MD5 429d50ea200d1d7a9bb597d3eaeef237 ChangeLog 1779
+MD5 e8e113a270c32543058716d456757a6d am-utils-6.0.10.ebuild 1080
 MD5 711232de603b2f30af85608b0ba43ca7 files/am-utils-gdbm.patch 1578
 MD5 04ee491d48ffa52a449c447af3c8fbce files/amd.conf 770
 MD5 f08163d2626b71a6c983fc1d0b9383ab files/amd.net 160
 MD5 b3377608b057b265eda754cea94bb69e files/amd.rc 544
 MD5 74f5c331bf7692293e5eb8b1d69310de files/digest-am-utils-6.0.9-r1 67
+MD5 ad7d6557026c6f9dd281a4e9a80e64a4 files/digest-am-utils-6.0.10 68
+MD5 be507ff6c41cb6a4a15be900320c8429 files/am-utils-6.0.10-parallel-build.patch 2323
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCpfdlMGnpIbeahxwRApZcAKCLCfeEx5yUmMvGUwH6Wt5gswfppwCfappu
+7uR46+xYRgkknuH0Z3FHVLE=
+=IGuk
+-----END PGP SIGNATURE-----
diff --git a/net-fs/am-utils/am-utils-6.0.10.ebuild b/net-fs/am-utils/am-utils-6.0.10.ebuild
new file mode 100644
index 000000000000..0cc46c73acd3
--- /dev/null
+++ b/net-fs/am-utils/am-utils-6.0.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/am-utils/am-utils-6.0.10.ebuild,v 1.1 2005/06/07 19:36:40 griffon26 Exp $
+
+inherit eutils
+
+DESCRIPTION="amd automounter and utilities"
+HOMEPAGE="http://www.am-utils.org/"
+SRC_URI="ftp://ftp.am-utils.org/pub/am-utils/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ldap"
+
+RDEPEND="ldap? ( >=net-nds/openldap-1.2 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-parallel-build.patch
+
+	# Rerun autotools
+	einfo "Regenerating autotools files..."
+	libtoolize --copy --force && \
+	aclocal && \
+	autoconf && \
+	automake || die "autotools failed"
+}
+
+src_compile() {
+	econf \
+		$(use_with ldap) \
+		--sysconfdir=/etc/amd \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc/amd
+	doins "${FILESDIR}"/amd.{conf,net}
+	newinitd "${FILESDIR}/amd.rc" amd
+}
diff --git a/net-fs/am-utils/files/am-utils-6.0.10-parallel-build.patch b/net-fs/am-utils/files/am-utils-6.0.10-parallel-build.patch
new file mode 100644
index 000000000000..c2eab6c06ee4
--- /dev/null
+++ b/net-fs/am-utils/files/am-utils-6.0.10-parallel-build.patch
@@ -0,0 +1,70 @@
+diff -ruN am-utils-6.0.10/amd/Makefile.am am-utils-6.0.10-fixed/amd/Makefile.am
+--- am-utils-6.0.10/amd/Makefile.am	2005-03-15 03:07:48.000000000 +0100
++++ am-utils-6.0.10-fixed/amd/Makefile.am	2005-05-28 23:48:24.850194336 +0200
+@@ -16,7 +16,12 @@
+ # which will not generate the .h needs for the lex file from the yacc file.
+ # I took out the conf .y/.l files b/c of bad interaction between bsd44 make
+ # and automake-1.2 rules.
++
++# sources needed: note .y and .l files have to be first
+ amd_SOURCES =			\
++	conf_parse.y	\
++	conf_tok.l	\
++	\
+ 	am_ops.c		\
+ 	amd.c			\
+ 	amfs_auto.c		\
+@@ -82,27 +87,29 @@
+ # filesystem types this system supports.
+ # AMD_INFO_OBJS: a list of info_*.o objects added, depending on which map
+ # types this system supports.
+-EXTRA_amd_OBJECTS = @AMD_FS_OBJS@ @AMD_INFO_OBJS@ conf_tok.o conf_parse.o
++EXTRA_amd_OBJECTS = @AMD_FS_OBJS@ @AMD_INFO_OBJS@
+ LDADD = $(EXTRA_amd_OBJECTS) ../libamu/libamu.la
+ # must manually add f/lex library to LIBS, and not to LDADD.
+ LIBS = @LIBS@ @LEXLIB@
+ 
+ # additional files to distribute and clean
+-EXTRA_DIST = conf_tok.l conf_parse.y ops_TEMPLATE.c $(man_MANS)
++EXTRA_DIST = ops_TEMPLATE.c $(man_MANS)
+ CLEANFILES = conf_tok.c conf_parse.c conf_parse.h
+ DISTCLEANFILES = build_version.h
+ 
++# do not distribute files that should be generated by lex/yacc locally
++dist-hook:
++	(cd $(distdir) && rm -f conf_parse.c conf_parse.h conf_tok.c)
++
+ INCLUDES = -I$(top_srcdir)/include
+ 
+ # allow users to add their own flags via "configure --enable-am-flags=ARG"
+ AMU_CFLAGS = @AMU_CFLAGS@
+ AM_CFLAGS = @CFLAGS@ $(AMU_CFLAGS)
+-YACC = @YACC@
+-YFLAGS = -d
++AM_YFLAGS = -d
+ 
+ # dependencies
+ $(PROGRAMS): $(LDADD)
+-conf_tok.o: conf_parse.h
+ get_args.o: build_version.h
+ $(amd_OBJECTS) $(EXTRA_amd_OBJECTS):		\
+ 	../config.h				\
+@@ -115,18 +122,6 @@
+ 	@AMU_NFS_PROT_HEADER@			\
+ 	$(noinst_HEADERS)
+ 
+-# Must use my rules, b/c ones supplied by automake-1.2 don't work
+-# with bsd44 make (they have built-in rules to build yacc/lex files).
+-# Code generated by yacc/lex:
+-conf_tok.c: $(srcdir)/conf_tok.l
+-	$(LEX) $?
+-	mv lex.yy.c conf_tok.c
+-
+-conf_parse.c conf_parse.h: $(srcdir)/conf_parse.y
+-	$(YACC) -d $?
+-	mv y.tab.c conf_parse.c
+-	mv y.tab.h conf_parse.h
+-
+ # auto-generate build number
+ build_version.h: $(amd_SOURCES) $(EXTRA_amd_SOURCES)	\
+ 		../config.h				\
diff --git a/net-fs/am-utils/files/digest-am-utils-6.0.10 b/net-fs/am-utils/files/digest-am-utils-6.0.10
new file mode 100644
index 000000000000..73b34299fbf1
--- /dev/null
+++ b/net-fs/am-utils/files/digest-am-utils-6.0.10
@@ -0,0 +1 @@
+MD5 ec26df84e2ef9d55c9e6ea3c648788d4 am-utils-6.0.10.tar.gz 1650526