Fixed build problem reported by Markus Meier in bug #244246 comment 9. Dropped keywords due to new dependencies.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

6 files changed, 245 insertions, 84 deletions

diff --git a/app-text/dictd/ChangeLog b/app-text/dictd/ChangeLog
index 5c86b5c3dc1f..d62d0d4162a7 100644
--- a/app-text/dictd/ChangeLog
+++ b/app-text/dictd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/dictd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.44 2008/10/26 14:16:01 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.45 2008/11/03 15:51:22 pva Exp $
+
+*dictd-1.10.11-r3 (03 Nov 2008)
+
+  03 Nov 2008; Peter Volkov <pva@gentoo.org>
+  +files/dictd-1.10.11-automatic-plugins_build-failure.patch, metadata.xml,
+  -dictd-1.10.11.ebuild, +dictd-1.10.11-r3.ebuild:
+  Fixed build problem reported by Markus Meier in bug #244246 comment 9.
+  Dropped keywords due to new dependencies.
 
   26 Oct 2008; Ferris McCormick <fmccor@gentoo.org> dictd-1.10.11-r2.ebuild:
   Sparc stable, Bug #244246, everything looks good.
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 21c293d7608e..4098efa006a6 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -14,6 +14,7 @@ AUX 1.9.11-r1/dictd 1764 RMD160 30ba15cec4d7e1ea775979e978c654b09520faf6 SHA1 79
 AUX 1.9.11-r1/dictd.conf 569 RMD160 e34f2bdb7e72d13392563c302f379485c0ddb9cb SHA1 b42419bcf3d94c66c86cfb827384b0f770f0951e SHA256 8fd62c0d1863c003cdfda0bff4a7d411bcd3fdd2d71c78570336aff86af6d571
 AUX 1.9.11-r1/dictd.confd 135 RMD160 8f18e03081f40c23f54ff6f0efd6eef08256284a SHA1 32262702fa3de44d3370dcc123186c76667601dd SHA256 46b0fabcdacae8db886f732562509c004fd88f01c245664fe208525bbc72b3a1
 AUX 1.9.11-r1/site.info 235 RMD160 3bee51beb2ad856a6de1941764158f558c124733 SHA1 5de46179c02e3cf7a6f5360e5399b089db30878d SHA256 cb55e7aaedef73665996f015a07e97e45cd3771775e291d798bf163b0052c0a2
+AUX dictd-1.10.11-automatic-plugins_build-failure.patch 3526 RMD160 87634d68479552fc81426270916e9f3fb2b10fcc SHA1 6a7842b0a751effd1cc9d51df4a6e37f1ff0dcb2 SHA256 2b274da4b1cbb27a164c1a2213b1d962a979cf4a6c473d78758012fcfae2da75
 AUX dictd-1.10.11-colorit-nopp-fix.patch 428 RMD160 65d43cbcad57ff1cfd5e604b6bf0517d7e98054b SHA1 ea0315f5346b8c2dd76cf62c1b56c1c2008064da SHA256 50b09efb6fa87b51d85f15fc4ef0fd29b5d0682025a2eccf7ca45917ea7f6582
 AUX dictd-1.10.11-dictd.8-man.patch 699 RMD160 e292334a79a8aa60c713f79260f4fa1256294ed6 SHA1 50fa1ab5ac938ad59f532375fcdac41e69b38ea0 SHA256 30df5828de15b724f1a670d61f14c6798ad43f8fcb970e00169c45ad969389b1
 AUX dictd-1.10.11-dictd.c-alen-init.patch 612 RMD160 ae07454e182e2f8f17a24ecf5ae550bf71847128 SHA1 22cf78d5de420718de734a3169f67b91ce266c74 SHA256 a8ff41628c48ea4086d23016354657f7ea8e74536d538cb036065f3a6e84f098
@@ -24,8 +25,8 @@ DIST dictd-1.10.11.tar.gz 696755 RMD160 829a71325d59210023b420ffe89cd5477d354cdb
 DIST dictd-1.9.11.tar.gz 695037 RMD160 05a96cc450fbf6f28b3d953fa8982b6b865f27da SHA1 04cfab51c9644b32e1011d213f127a7cb28b32df SHA256 950ab4d82678c2edc17bcddde1ea89be8d47f6c91aee2b765c6caf3d9458eb71
 DIST dictd-1.9.14.tar.gz 749577 RMD160 7e97124f0ccbff5a1190e50943d144854a5c82bd SHA1 bb20ce6ac112742998a0083f6d7d96b95203c84d SHA256 9f7fb75996047f837261a60085e930aae813f6decb68745602ba3d6f0563d708
 EBUILD dictd-1.10.11-r2.ebuild 2950 RMD160 9acb46753db2002d957d1dd4944d9b878714cdc6 SHA1 ae479a5267bef63feffe24dbe45ff7b616b3b537 SHA256 f5ca52567d9096e6bbe4b579a1e2f2db71f0bd8ecab47e913e515c9dec7a1b0e
-EBUILD dictd-1.10.11.ebuild 2381 RMD160 4d158a3b1df02630050573a6c8768c3e079c4764 SHA1 bf49db4b16064d90eaf6449cbd113559d3bc4f74 SHA256 b3163f371227d192e8b17969125049c631ab2bbffbca619ccf84445d6ed36b99
+EBUILD dictd-1.10.11-r3.ebuild 3113 RMD160 15609ed98af1e290a67e8176a9c2cdd280e061ab SHA1 f133b7612ebde99acc376acf728e476c22eb96e3 SHA256 2d2bae1607146e5d0d68ab165fb25624a0c82b72a9407bc7ef974b4fe093cb8b
 EBUILD dictd-1.9.11-r1.ebuild 1216 RMD160 f229a030c647f1436613ecd163ab2b027cc20397 SHA1 1b4a63a1e9738127196569add730c8d0e892cbfc SHA256 a4883457eec96f38c4d49df49ada2bbfc11faa903feee40a11748da4d335bc80
 EBUILD dictd-1.9.14.ebuild 1226 RMD160 5e9551ed61d1cfa7ea09fe12ef22408599230584 SHA1 267fab851770f877fd48b989d2934e98801ff76f SHA256 37ea9118b0bfb5bf38d846eb359437f6898205086dbdcebc9ec3f5de57ae2b6e
-MISC ChangeLog 8155 RMD160 7028c3265e77f0205ad1a5e3d83d05eecb572393 SHA1 62805f2d962c9137ff5312bcef53f61033cbea24 SHA256 dd99fc0ce85440eb4966410eab4e75830c996e72910c6b6b92aec25617975df3
-MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
+MISC ChangeLog 8475 RMD160 7c52f7e093c0249c9a1b0d578f2fca7b94186540 SHA1 12c7561f82f1b57d82a35211d1d53ea919ce4b62 SHA256 e9c43e856f84d656d4af65791b5c2545cc803fc54dd3930e3f94a1c86b590f7b
+MISC metadata.xml 441 RMD160 f87ec33f5dd676dc8bb1a907ef63e2a553cc61cd SHA1 d5c072ccc0b4534417e47597c3fecdba3dedf563 SHA256 271007859ca1ce4c94076aa6e0f1cfa10d9c382ed8776209490544816ad32930
diff --git a/app-text/dictd/dictd-1.10.11-r3.ebuild b/app-text/dictd/dictd-1.10.11-r3.ebuild
new file mode 100644
index 000000000000..4984035251ed
--- /dev/null
+++ b/app-text/dictd/dictd-1.10.11-r3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.10.11-r3.ebuild,v 1.1 2008/11/03 15:51:22 pva Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+HOMEPAGE="http://www.dict.org/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+SLOT="0"
+# We install rfc so - ISOC-rfc
+LICENSE="GPL-2 ISOC-rfc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="dbi judy"
+
+# <gawk-3.1.6 makes tests fail.
+DEPEND="sys-apps/coreutils
+		sys-libs/zlib
+		dbi? ( dev-db/libdbi )
+		judy? ( dev-libs/judy )
+		|| ( >=sys-apps/coreutils-6.10 sys-apps/mktemp )
+		sys-apps/sed"
+RDEPEND="${DEPEND}
+		>=sys-apps/gawk-3.1.6"
+
+pkg_setup() {
+	enewgroup dictd
+	enewuser dictd -1 -1 -1 dictd
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/dictd-1.10.11-colorit-nopp-fix.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictd.8-man.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictl-konwert.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictd.c-alen-init.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictl-translit.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-automatic-plugins_build-failure.patch"
+	eautoreconf
+}
+
+src_test() {
+	if ! hasq userpriv "${FEATURES}"; then
+		# If dictd is run as root user (-userpriv) it drops its privileges to
+		# dictd user and group. Give dictd group write access to test directory.
+		chown :dictd "${WORKDIR}" "${S}/test"
+		chmod 770 "${WORKDIR}" "${S}/test"
+	fi
+	emake test || die
+}
+
+src_compile() {
+	# with-local-libmaa is needed because libmaa is not in the tree
+	# because nothing in the whole wide world but dictd uses it.
+	# There are no sources apart from those in dictd, no homepage, nothing.
+	# Doesn't really make sense to split it off from dictd into its own package
+	# and add that just for dictd.
+	econf \
+		$(use_with dbi) \
+		$(use_with judy) \
+		--sysconfdir=/etc/dict \
+		--with-cflags="${CFLAGS}" \
+		--with-local-libmaa
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	# Install docs
+	dodoc README TODO ChangeLog ANNOUNCE NEWS || die "installing docs part 1 failed"
+	dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt} || die "installing docs part 2 failed"
+	dodoc doc/{security.doc,toc.ms} || die "installing docs part 3 failed"
+
+	# conf files.
+	insinto /etc/dict
+	for f in dict.conf dictd.conf site.info colorit.conf; do
+		doins "${FILESDIR}/1.10.11/${f}" || die "failed to install ${f}"
+	done
+
+	# startups for dictd
+	newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd || die "failed to install dictd.initd"
+	newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd || die "failed to install dictd.confd"
+}
+
+pkg_postinst() {
+	echo
+	elog "To start and use ${PN} you will have to emerge at least one dictionary from"
+	elog "the app-dicts category with the package name starting with 'dictd-'."
+	elog "To install all available dictionaries, emerge app-dicts/dictd-dicts."
+	elog "${PN} will NOT start without at least one dictionary."
+	echo
+}
diff --git a/app-text/dictd/dictd-1.10.11.ebuild b/app-text/dictd/dictd-1.10.11.ebuild
deleted file mode 100644
index 8e8d60adff2e..000000000000
--- a/app-text/dictd/dictd-1.10.11.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.10.11.ebuild,v 1.1 2008/04/14 11:10:59 pva Exp $
-
-DESCRIPTION="Dictionary Client/Server for the DICT protocol"
-HOMEPAGE="http://www.dict.org/"
-SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-# The dictd tests are broken.
-#RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -i -e 's:^CFLAGS=\(.*\):CFLAGS=\1 -fPIC:' libmaa/Makefile.in
-}
-
-src_compile() {
-	# with-local-libmaa is needed because libmaa is not in the tree
-	# because nothing in the whole wide world but dictd uses it.
-	# There are no sources apart from those in dictd, no homepage, nothing.
-	# Doesn't really make sense to split it off from dictd into its own package
-	# and add that just for dictd.
-	econf \
-		--with-cflags="${CFLAGS}" \
-		--with-local-libmaa \
-		--without-local-zlib \
-		--without-local-dmalloc \
-		--without-local-regex \
-		--without-checker \
-		--without-efence \
-		--without-insure \
-		--without-purify \
-		--disable-plugin \
-		--sysconfdir=/etc/dict || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	# Now install it.
-	make DESTDIR="${D}" install || die "install failed"
-
-	# Install docs
-	dodoc README TODO ChangeLog ANNOUNCE || die "installing docs part 1 failed"
-	dodoc doc/dicf.ms doc/rfc.ms doc/rfc.sh doc/rfc2229.txt || die "installing docs part 2 failed"
-	dodoc doc/security.doc doc/toc.ms || die "installing docs part 3 failed"
-
-	# conf files.
-	dodir /etc/dict
-	insinto /etc/dict
-	doins "${FILESDIR}"/1.10.9/dict.conf
-	doins "${FILESDIR}"/1.10.9/dictd.conf
-	doins "${FILESDIR}"/1.10.9/site.info
-
-	# startups for dictd
-	newinitd "${FILESDIR}"/1.10.9/dictd dictd
-	newconfd "${FILESDIR}"/1.10.9/dictd.confd dictd
-
-	# Remove useless cruft, fixes bug 107376
-	rm -f "${D}"/usr/bin/colorit
-	rm -f "${D}"/usr/share/man/man1/colorit.1
-}
-
-pkg_postinst() {
-	echo
-	elog "To start and use ${PN} you will have to emerge at least one dictionary from"
-	elog "the app-dicts category with the package name starting with 'dictd-'."
-	elog "To install all available dictionaries, emerge app-dicts/dictd-dicts."
-	elog "${PN} will NOT start without at least one dictionary."
-	echo
-}
diff --git a/app-text/dictd/files/dictd-1.10.11-automatic-plugins_build-failure.patch b/app-text/dictd/files/dictd-1.10.11-automatic-plugins_build-failure.patch
new file mode 100644
index 000000000000..07f0179d5107
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.10.11-automatic-plugins_build-failure.patch
@@ -0,0 +1,131 @@
+=== modified file 'Makefile.in'
+--- Makefile.in	2008-11-03 11:47:00 +0000
++++ Makefile.in	2008-11-03 14:01:26 +0000
+@@ -58,7 +58,7 @@
+ EXEEXT=@EXEEXT@
+ 
+ CONF_DIR=@sysconfdir@/
+-PLUGIN_DIR=${libexecdir}/
++PLUGIN_DIR=${libexecdir}
+ DICT_DIR=${datadir}/
+ 
+ CC=		@CC@
+@@ -80,6 +80,8 @@
+ 
+ LDFLAGS=        @LDFLAGS@ @LIBS@
+ LIBOBJS=        @LIBOBJS@
++MAALIB=		@MAALIB@
++MAACPPFLAGS=	@MAACPPFLAGS@
+ EXES=	 	dict dictd dictzip dictfmt
+ 
+ all: $(EXES) $(LIBRARIES)
+@@ -155,19 +157,19 @@
+ endif
+ 
+ %.o: %.c
+-	$(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $< -o $@
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $(MAACPPFLAGS) $< -o $@
+ %.o: %.cpp
+-	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $< -o $@
++	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $(MAACPPFLAGS) $< -o $@
+ 
+ %: %.o
+ 	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \
+ 		$(filter-out local_regex local_zlib local_libmaa, $^) \
+-		$(OBJS) $(LDFLAGS) -lz
++		$(OBJS) $(LDFLAGS) $(MAALIB) -lz
+ 
+ dictd: dictd.o
+ 	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \
+ 		$(filter-out local_regex local_zlib local_libmaa, $^) \
+-		$(DBILIB) $(OBJS) $(LDFLAGS) -lz
++		$(DBILIB) $(OBJS) $(LDFLAGS) $(MAALIB) -lz
+ 
+ include $(srcdir)/deps
+ 
+@@ -197,14 +199,14 @@
+ 	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -module \
+ 		$(filter-out local_regex local_zlib local_libmaa, $(^:.o=.lo)) \
+ 		-rpath "${PLUGIN_DIR}" \
+-		$(LDFLAGS) $(JUDYLIB)
++		$(LDFLAGS)
+ 
+ dictdplugin_dbi.la : heap.o dictdplugin_dbi.o str.o \
+                      plugins_common.o $(LIBOBJS)
+ 	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -module \
+ 		$(filter-out local_regex local_zlib local_libmaa, $(^:.o=.lo)) \
+ 		-rpath "${PLUGIN_DIR}" \
+-		$(LDFLAGS) $(DBILIB) -ldl
++		$(LDFLAGS) -ldl
+ 
+ .PHONY: plugins
+ plugins: $(PLUGINS)
+
+=== modified file 'configure.in'
+--- configure.in	2008-11-03 11:47:00 +0000
++++ configure.in	2008-11-03 13:56:42 +0000
+@@ -215,14 +215,14 @@
+ echo Checking for libraries
+ 
+ if test "$local_libmaa" = 0; then
+-    AC_CHECK_LIB(maa,maa_shutdown,XLDFLAGS="$XLDFLAGS -lmaa",local_libmaa=1)
++    AC_CHECK_LIB(maa,maa_shutdown,MAALIB="-lmaa",local_libmaa=1)
+ fi
+ 
+ if test "$local_libmaa" = 1; then
+     AC_MSG_CHECKING(for libmaa in local source tree)
+     if test -d libmaa; then
+-        XLDFLAGS="$XLDFLAGS -Llibmaa -lmaa"
+-        XCPPFLAGS="$XCPPFLAGS -Ilibmaa"
++        MAALIB="-Llibmaa -lmaa"
++        MAACPPFLAGS="$XCPPFLAGS -Ilibmaa"
+ 
+         AC_CONFIG_SUBDIRS(libmaa)
+ 
+@@ -234,8 +234,21 @@
+     fi
+ fi
+ 
+-AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy])
+-AC_CHECK_LIB(dbi,  dbi_shutdown, [DBILIB=-ldbi])
++AC_ARG_WITH(dbi,
++[  --with-dbi              build libdbi plugin if possible (plugin support should be enabled)],
++[
++if test "x${withval}" != xno; then
++	AC_CHECK_LIB(dbi,  dbi_shutdown, [DBILIB=-ldbi])
++fi
++])
++
++AC_ARG_WITH(judy,
++[  --with-judy             build judy plugin if possible (plugin support should be enabled)],
++[
++if test "x${withval}" != xno; then
++	AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy])
++fi
++])
+ 
+ AC_CHECK_LIB(socket,main)
+ AC_CHECK_LIB(c,inet_ntoa,
+@@ -364,12 +377,10 @@
+ LIBEXECDIR=`eval3 $libexecdir`
+ DATADIR=`eval3 $datadir`
+ 
+-CPPFLAGS="$CPPFLAGS $XCPPFLAGS"
+ CFLAGS="$CFLAGS $XCFLAGS"
+ LDFLAGS="$LDFLAGS $XLDFLAGS"
+ 
+ AC_SUBST(DICT_VERSION)
+-AC_SUBST(CPPFLAGS)
+ AC_SUBST(CFLAGS)
+ AC_SUBST(USE_PLUGIN)
+ AC_SUBST(EXEEXT)
+@@ -380,6 +391,8 @@
+ AC_SUBST(JUDYLIB)
+ AC_SUBST(DBILIB)
+ AC_SUBST(LIBTOOL)
++AC_SUBST(MAALIB)
++AC_SUBST(MAACPPFLAGS)
+ 
+ AC_SUBST(SYSCONFDIR)
+ AC_SUBST(BINDIR)
+
diff --git a/app-text/dictd/metadata.xml b/app-text/dictd/metadata.xml
index 8f9450df306e..274ba06e9827 100644
--- a/app-text/dictd/metadata.xml
+++ b/app-text/dictd/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>app-dicts</herd>
+<use>
+  <flag name='dbi'>Build dbi plugin, uses <pkg>dev-db/libdbi</pkg> library for implementing DICT database using SQL server</flag>
+  <flag name='judy'>Build Judy-based (<pkg>dev-libs/judy</pkg>) plugin implementing fast "exact" and especially "lev" strategies</flag>
+</use>
 </pkgmetadata>