Version bump. Dropped keywords, due to new dependency. Removed old.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-openvz.git-89451f9 i686

7 files changed, 236 insertions, 50 deletions

diff --git a/app-text/dictd/ChangeLog b/app-text/dictd/ChangeLog
index 65b187497e7f..ae8ee6ad8fe7 100644
--- a/app-text/dictd/ChangeLog
+++ b/app-text/dictd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.55 2008/12/01 21:41:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.56 2008/12/09 13:59:50 pva Exp $
+
+*dictd-1.11.0 (09 Dec 2008)
+
+  09 Dec 2008; Peter Volkov <pva@gentoo.org>
+  +files/dictd-1.11.0-automagic-plugins.patch,
+  +files/dictd-1.11.0-avoid-libs-in-LDFLAGS.patch,
+  +files/dictd-1.11.0-plugins-install-fix-and-cleanup.patch,
+  -dictd-1.9.11-r1.ebuild, +dictd-1.11.0.ebuild:
+  Version bump. Dropped keywords, due to new dependency. Removed old.
 
   01 Dec 2008; Brent Baude <ranger@gentoo.org> dictd-1.10.11-r2.ebuild,
   dictd-1.10.11-r3.ebuild:
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 51e2ba3128d6..848575c798bb 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -16,12 +16,15 @@ AUX dictd-1.10.11-dictd.c-alen-init.patch 612 RMD160 ae07454e182e2f8f17a24ecf5ae
 AUX dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch 459 RMD160 f7e5e465726ca9122050c01d8aed06ab757d8210 SHA1 e4aa46fafaa171313082614a3154c738b2aa7f55 SHA256 0e7a729d981e1828f2d2a13d3b5dbdbf4a8eea4576429602c34f2db774243e68
 AUX dictd-1.10.11-dictl-konwert.patch 1230 RMD160 3498b9645f0a1e3b934eb690e4630b630d01d937 SHA1 d3da0ef994a807f6fdbec734ff4a94fb6bacdf58 SHA256 2400a8bca8a29c3b9aea9322acbe4e1f7ad1bb8781e33c2b170a35ac37e223ee
 AUX dictd-1.10.11-dictl-translit.patch 637 RMD160 51f720f44143d9207e5b4c925834952d78e95201 SHA1 2a2cc154c895cb1829bb05d93850f35b2f86549e SHA256 cee93373bdc109b66d8a2a65f4fed9c33b4d4514e649d4125118a964547fb5b8
+AUX dictd-1.11.0-automagic-plugins.patch 823 RMD160 52ee5d9f22d8420ba14fb725d10e8f0e5d485ba9 SHA1 7baff7852905b6453be27619838a5d330cd2956c SHA256 24067b03caa3de3fc54071395463d38f2e46eb4fd9e7eab43143614e1e4425ce
+AUX dictd-1.11.0-avoid-libs-in-LDFLAGS.patch 1758 RMD160 3005522be686d8c4fbab369500b0ee2d3e0c96df SHA1 45a99e15faa9cab53c241738865008b77c71b1eb SHA256 a339e7aef82489eb5bcd1f6c5a8ff737ff1a9047a4cdcf8a1624b3221cfa01ed
+AUX dictd-1.11.0-plugins-install-fix-and-cleanup.patch 662 RMD160 0ec7f11f5e72d7e23d9f74170ac7ae091dbebacb SHA1 3c56120b5de1520b8a1a9c704c9f7a8c5fb26af9 SHA256 3b25fc16f4c6152dcc5e7d3a4ce8d6cb5511d8e8d89db9982bc3c3a69253f2ef
 DIST dictd-1.10.11.tar.gz 696755 RMD160 829a71325d59210023b420ffe89cd5477d354cdb SHA1 7d37969424dfef19fa4975b876a0fab4e26fed8c SHA256 a5730cb0c67582d115057b409a6e75d903f56595a6690a7d435e22ae22857899
-DIST dictd-1.9.11.tar.gz 695037 RMD160 05a96cc450fbf6f28b3d953fa8982b6b865f27da SHA1 04cfab51c9644b32e1011d213f127a7cb28b32df SHA256 950ab4d82678c2edc17bcddde1ea89be8d47f6c91aee2b765c6caf3d9458eb71
+DIST dictd-1.11.0.tar.gz 417541 RMD160 982d4adbe613110bfd0e249ce8c8df9c222ab304 SHA1 d3ff60e88e9c83e82605481c9fb919eb21a6565f SHA256 88fa5ff0238d77ce82da0e8ccfc89ed3235e6a8da0347871e77cb79a8ffbf2c1
 DIST dictd-1.9.14.tar.gz 749577 RMD160 7e97124f0ccbff5a1190e50943d144854a5c82bd SHA1 bb20ce6ac112742998a0083f6d7d96b95203c84d SHA256 9f7fb75996047f837261a60085e930aae813f6decb68745602ba3d6f0563d708
 EBUILD dictd-1.10.11-r2.ebuild 2948 RMD160 538db9bbe5f52042804ec3daeeae67743f5af49f SHA1 1548ae7ac1428035f34e3e127feeac2dc143c2e9 SHA256 7046527cad2cb99c08eab27bced16c4064918abe5a8d3af39e4f1064bb55a57f
 EBUILD dictd-1.10.11-r3.ebuild 3280 RMD160 8e7811bd6de2694ef5c54ab236935c3d03a86b7c SHA1 02ac40a6041d9e2a16fd868c1adbb2fc3abefe9a SHA256 cee54b7208781a9627633fe59e9225b94dcb3ad37aa97ab9c587568ee3d9a52f
-EBUILD dictd-1.9.11-r1.ebuild 1216 RMD160 f229a030c647f1436613ecd163ab2b027cc20397 SHA1 1b4a63a1e9738127196569add730c8d0e892cbfc SHA256 a4883457eec96f38c4d49df49ada2bbfc11faa903feee40a11748da4d335bc80
+EBUILD dictd-1.11.0.ebuild 2866 RMD160 657ee816f36e482144be1b8dfd18e72f188455cf SHA1 0be906b4a811a0f337321d4ce6b978b96fdaecab SHA256 68273a6eadb63f27f8de74ac60502e3dd4b245dd6e84c6ae30da14092927a13e
 EBUILD dictd-1.9.14.ebuild 1226 RMD160 5e9551ed61d1cfa7ea09fe12ef22408599230584 SHA1 267fab851770f877fd48b989d2934e98801ff76f SHA256 37ea9118b0bfb5bf38d846eb359437f6898205086dbdcebc9ec3f5de57ae2b6e
-MISC ChangeLog 10001 RMD160 5d2b402bf8ebe68d9a782319abe5883d9897a1ce SHA1 cd1c1e5b1850a12aa06812581b7c83eb3b5aa72a SHA256 69a5c85ad64375d946194ac98609fe391205d377c47f684799f92b12bedfb4a9
+MISC ChangeLog 10351 RMD160 58ad3ba87bc81dbdfc208cf88ef06794add6ca8f SHA1 2aa0d2d3da2c60cb1fea227dbcb5a4de3485c828 SHA256 6e0ae8ad3cef9caa3abd40d77ca3205fb7fd22f22bfbafd7fc6c63915fb57321
 MISC metadata.xml 441 RMD160 f87ec33f5dd676dc8bb1a907ef63e2a553cc61cd SHA1 d5c072ccc0b4534417e47597c3fecdba3dedf563 SHA256 271007859ca1ce4c94076aa6e0f1cfa10d9c382ed8776209490544816ad32930
diff --git a/app-text/dictd/dictd-1.11.0.ebuild b/app-text/dictd/dictd-1.11.0.ebuild
new file mode 100644
index 000000000000..8896108687e8
--- /dev/null
+++ b/app-text/dictd/dictd-1.11.0.ebuild
@@ -0,0 +1,95 @@
+# 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.11.0.ebuild,v 1.1 2008/12/09 13:59:50 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 ~x86"
+IUSE="dbi judy"
+
+# <gawk-3.1.6 makes tests fail.
+DEPEND="sys-apps/coreutils
+		sys-libs/zlib
+		dev-libs/libmaa
+		dbi? ( dev-db/libdbi )
+		judy? ( dev-libs/judy )
+		|| ( >=sys-apps/coreutils-6.10 sys-apps/mktemp )"
+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-dictd.8-man.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictl-konwert.patch"
+	epatch "${FILESDIR}/dictd-1.10.11-dictl-translit.patch"
+	epatch "${FILESDIR}/dictd-1.11.0-avoid-libs-in-LDFLAGS.patch"
+	epatch "${FILESDIR}/dictd-1.11.0-automagic-plugins.patch"
+	epatch "${FILESDIR}/dictd-1.11.0-plugins-install-fix-and-cleanup.patch"
+	eautoreconf
+}
+
+src_test() {
+	if use ppc || use ppc64; then
+		ewarn "Tests are known to fail on big-endian systems (ppc, ppc64)"
+		ewarn "Skipping tests."
+	else
+		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
+	fi
+}
+
+src_compile() {
+	econf \
+		$(use_with dbi) \
+		$(use_with judy) \
+		--sysconfdir=/etc/dict
+	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.9.11-r1.ebuild b/app-text/dictd/dictd-1.9.11-r1.ebuild
deleted file mode 100644
index e8e4fde56b41..000000000000
--- a/app-text/dictd/dictd-1.9.11-r1.ebuild
+++ /dev/null
@@ -1,46 +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.9.11-r1.ebuild,v 1.14 2008/09/12 19:20:55 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="x86 ~ppc sparc alpha ~hppa ~mips amd64 ia64 ppc64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf \
-		--with-cflags="${CFLAGS}" \
-		--sysconfdir=/etc/dict || die
-	make || die
-}
-
-src_install() {
-	# Now install it.
-	make DESTDIR="${D}" install || die "install failed"
-
-	# Install docs
-	dodoc README TODO ChangeLog ANNOUNCE
-	dodoc doc/dicf.ms doc/rfc.ms doc/rfc.sh doc/rfc2229.txt
-	dodoc doc/security.doc doc/toc.ms
-
-	# conf files.
-	dodir /etc/dict
-	insinto /etc/dict
-	doins "${FILESDIR}"/${PVR}/dict.conf
-	doins "${FILESDIR}"/${PVR}/dictd.conf
-	doins "${FILESDIR}"/${PVR}/site.info
-
-	# startups for dictd
-	newinitd "${FILESDIR}"/${PVR}/dictd dictd
-	newconfd "${FILESDIR}"/${PVR}/dictd.confd dictd
-
-	# Remove useless cruft, fixes bug 107376
-	rm -f "${D}"/usr/bin/colorit
-	rm -f "${D}"/usr/share/man/man1/colorit.1
-}
diff --git a/app-text/dictd/files/dictd-1.11.0-automagic-plugins.patch b/app-text/dictd/files/dictd-1.11.0-automagic-plugins.patch
new file mode 100644
index 000000000000..cb7b3b08329c
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.11.0-automagic-plugins.patch
@@ -0,0 +1,28 @@
+=== modified file 'configure.in'
+--- configure.in	2008-12-08 18:15:58 +0000
++++ configure.in	2008-12-08 18:17:44 +0000
+@@ -146,8 +146,21 @@
+ AC_CHECK_LIB(maa,maa_shutdown,MAALIB="-lmaa",
+ 	[AC_MSG_ERROR([Libmaa not found])])
+ 
+-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,
+
diff --git a/app-text/dictd/files/dictd-1.11.0-avoid-libs-in-LDFLAGS.patch b/app-text/dictd/files/dictd-1.11.0-avoid-libs-in-LDFLAGS.patch
new file mode 100644
index 000000000000..7251023adbc1
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.11.0-avoid-libs-in-LDFLAGS.patch
@@ -0,0 +1,67 @@
+=== modified file 'Makefile.in'
+--- Makefile.in	2008-12-08 18:10:53 +0000
++++ Makefile.in	2008-12-08 18:14:38 +0000
+@@ -78,6 +78,7 @@
+ 
+ LDFLAGS=        @LDFLAGS@ @LIBS@
+ LIBOBJS=        @LIBOBJS@
++MAALIB=		@MAALIB@
+ EXES=	 	dict dictd dictzip dictfmt
+ 
+ all: $(EXES) $(LIBRARIES)
+@@ -158,12 +159,12 @@
+ %: %.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
+ 
+
+=== modified file 'configure.in'
+--- configure.in	2008-12-08 18:10:53 +0000
++++ configure.in	2008-12-08 18:08:55 +0000
+@@ -143,26 +143,8 @@
+ echo .
+ echo Checking for libraries
+ 
+-if test "$local_libmaa" = 0; then
+-   AC_CHECK_LIB(maa,maa_shutdown,XLDFLAGS="$XLDFLAGS -lmaa",
++AC_CHECK_LIB(maa,maa_shutdown,MAALIB="-lmaa",
+ 	[AC_MSG_ERROR([Libmaa not found])])
+-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"
+-
+-        AC_CONFIG_SUBDIRS(libmaa)
+-
+-        allsubdirs="$allsubdirs libmaa"
+-        AC_MSG_RESULT(yes)
+-    else
+-        AC_MSG_RESULT(no)
+-        AC_MSG_ERROR([Libmaa not found, cannot continue])
+-    fi
+-fi
+ 
+ AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy])
+ AC_CHECK_LIB(dbi,  dbi_shutdown, [DBILIB=-ldbi])
+@@ -316,6 +298,7 @@
+ AC_SUBST(JUDYLIB)
+ AC_SUBST(DBILIB)
+ AC_SUBST(LIBTOOL)
++AC_SUBST(MAALIB)
+ 
+ AC_SUBST(SYSCONFDIR)
+ AC_SUBST(BINDIR)
+
diff --git a/app-text/dictd/files/dictd-1.11.0-plugins-install-fix-and-cleanup.patch b/app-text/dictd/files/dictd-1.11.0-plugins-install-fix-and-cleanup.patch
new file mode 100644
index 000000000000..40837f443cc7
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.11.0-plugins-install-fix-and-cleanup.patch
@@ -0,0 +1,30 @@
+=== modified file 'Makefile.in'
+--- Makefile.in	2008-12-08 18:15:58 +0000
++++ Makefile.in	2008-12-08 18:24:44 +0000
+@@ -56,7 +56,7 @@
+ EXEEXT=@EXEEXT@
+ 
+ CONF_DIR=@sysconfdir@/
+-PLUGIN_DIR=${libexecdir}/
++PLUGIN_DIR=${libexecdir}
+ DICT_DIR=${datadir}/
+ 
+ CC=		@CC@
+
+=== modified file 'configure.in'
+--- configure.in	2008-12-08 18:20:10 +0000
++++ configure.in	2008-12-08 18:24:03 +0000
+@@ -295,12 +295,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)
+