diff options
| author |   Peter Volkov <pva@gentoo.org> | 2009-12-27 11:22:57 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2009-12-27 11:22:57 +0000 |
| commit | a02ec0d051246c79b9f82f7adfa7e1a4154f3acb (patch) | |
| tree | 9965de84538fa460d5d8247d8ef4fad017f3381a /app-text/dictd | |
| parent | clean up (diff) | |
| download | historical-a02ec0d051246c79b9f82f7adfa7e1a4154f3acb.tar.gz historical-a02ec0d051246c79b9f82f7adfa7e1a4154f3acb.tar.bz2 historical-a02ec0d051246c79b9f82f7adfa7e1a4154f3acb.zip | |
Version bump. Clean old.
Package-Manager: portage-2.1.7.16/cvs/Linux x86_64
Diffstat (limited to 'app-text/dictd')
21 files changed, 60 insertions, 877 deletions
diff --git a/app-text/dictd/ChangeLog b/app-text/dictd/ChangeLog index 7f945c2f639a..b7d36476781c 100644 --- a/app-text/dictd/ChangeLog +++ b/app-text/dictd/ChangeLog @@ -1,6 +1,24 @@ # ChangeLog for app-text/dictd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.79 2009/10/17 07:46:23 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/ChangeLog,v 1.80 2009/12/27 11:22:56 pva Exp $ + +*dictd-1.11.2 (27 Dec 2009) + + 27 Dec 2009; Peter Volkov <pva@gentoo.org> -dictd-1.9.14.ebuild, + -files/dictd-1.10.11-automatic-plugins_build-failure.patch, + -files/dictd-1.10.11-dictd.8-man.patch, + -files/dictd-1.10.11-dictd.c-alen-init.patch, + -files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch, + -files/dictd-1.10.11-dictl-konwert.patch, + -files/dictd-1.10.11-dictl-translit.patch, + -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.11.2.ebuild, -files/1.9.11-r1/dict.conf, -files/1.9.11-r1/dictd, + -files/1.9.11-r1/dictd.conf, -files/1.9.11-r1/dictd.confd, + -files/1.9.11-r1/site.info, -dictd-1.10.11-r2.ebuild, + -dictd-1.10.11-r3.ebuild, -dictd-1.11.0.ebuild, -dictd-1.11.1.ebuild: + Version bump. Clean old. 17 Oct 2009; Markus Meier <maekke@gentoo.org> metadata.xml: remove dbi description as it is global now diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest index 133b780fbd8b..6214dbe5c72e 100644 --- a/app-text/dictd/Manifest +++ b/app-text/dictd/Manifest @@ -1,43 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 1.10.11/colorit.conf 848 RMD160 cebf4cd68e62ee6218bb39f88c655d3bacaa3c25 SHA1 47f9188eee886463c13c853831d073d1711c0392 SHA256 54969fbc6e782013c086e3055f0fa1989ddeb71f5b87e94205d82cefee657d8f AUX 1.10.11/dict.conf 243 RMD160 5adc267e57f7a4e526d2b6d7ef43ed712d1e6a19 SHA1 acaad0d56fc7fa4f3cc48152ad13cbba265c8faa SHA256 278b6986ebbfe74396a9e287d94a2d8128a83d511df84f02093058081aa12d57 AUX 1.10.11/dictd.conf 563 RMD160 18b435b7ef4ca3a8da6f38706965857bc1d0e28e SHA1 839fbbb050069cd4600e0cf18580e4b6ae64c43c SHA256 06f1c42afd56a98a736cc252f0271889030d8b57754bc4054905e318508d5e37 AUX 1.10.11/dictd.confd 204 RMD160 5f8e7e3d62691046beb21db7a589933c9087c2a0 SHA1 b89dde0caae092eb6f232d323f21fe7b43d23d0f SHA256 988c5f8e391519119c456af8cd308c1f323b4701aefff3d662944e3d3499a25a AUX 1.10.11/dictd.initd 2079 RMD160 cccabf4471907be68a7a43fe2a7aa704ad1ebb33 SHA1 eba116dc66e812ac6e74e2113d0422117a6a89f5 SHA256 f3d6a6bbe34411f19bee071e97c41997148029e8147d7e9842dfb0101fe2e9cb AUX 1.10.11/site.info 235 RMD160 3bee51beb2ad856a6de1941764158f558c124733 SHA1 5de46179c02e3cf7a6f5360e5399b089db30878d SHA256 cb55e7aaedef73665996f015a07e97e45cd3771775e291d798bf163b0052c0a2 -AUX 1.9.11-r1/dict.conf 243 RMD160 5adc267e57f7a4e526d2b6d7ef43ed712d1e6a19 SHA1 acaad0d56fc7fa4f3cc48152ad13cbba265c8faa SHA256 278b6986ebbfe74396a9e287d94a2d8128a83d511df84f02093058081aa12d57 -AUX 1.9.11-r1/dictd 1764 RMD160 30ba15cec4d7e1ea775979e978c654b09520faf6 SHA1 79eba7d9a7b02e486ff6fa12c54d71fc18e55c3d SHA256 2c0f48f96362302b66c9e5ac823114db366608a4f0079a3a62a1fc9c581f43c1 -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 3618 RMD160 bd6335716ee2af94f3e9169d461819af0be129aa SHA1 78e849127d0c2e56301f06ef8746437c7cde5c94 SHA256 fd0e03c10f65f1b0dd26ba006ef6a48a855024fcbe1c9efece1122bad647a4d1 AUX dictd-1.10.11-colorit-nopp-fix.patch 323 RMD160 86c6559ff0518e282bed264310b6e216757a050d SHA1 7fda8a2d25e3df2de66e9f100c710c40db12f29b SHA256 720962dbe93456a948c489dd7ecc1f8384169b88c7a662ffee960b5eab4c7409 -AUX dictd-1.10.11-dictd.8-man.patch 791 RMD160 067999e6a2e1900f1c307dd573b09e15c24d4386 SHA1 85a8d8460e04e9025bc679e2c3cf07b6afeff52b SHA256 87eb9aeb6371d42d7145d8cafde0ed4795822a229794c0f7e5a6a79859fa4448 -AUX dictd-1.10.11-dictd.c-alen-init.patch 612 RMD160 ae07454e182e2f8f17a24ecf5ae550bf71847128 SHA1 22cf78d5de420718de734a3169f67b91ce266c74 SHA256 a8ff41628c48ea4086d23016354657f7ea8e74536d538cb036065f3a6e84f098 -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 1322 RMD160 81ebbc078d01d52b79efe3eeb39d2742580a6dfa SHA1 a3d98bc76658d961cd0f0f81b49545ac84408f41 SHA256 7356e31987ed658274727e53debd33efdaa6fd20d6b94b35614a5a3c9af067c9 -AUX dictd-1.10.11-dictl-translit.patch 728 RMD160 7aa77ab8e3905753811bf5be52dedc0a6d391b7f SHA1 95c08b6762dd0046a3a8a270daf788c103695b51 SHA256 5c2e58c92cebf2f39a3153d3a784b2ea9012394d20ac6ab25bec9a749fce2332 -AUX dictd-1.11.0-automagic-plugins.patch 915 RMD160 1f9e50c46d44cdec4535403fb9336ca8fb08d14a SHA1 64b94ad95641b8251d7a5e923c00c23b3a71de4d SHA256 92e5d5d2a8844b63ff4496b013c3a0d53e39bcbd83a49a3b13fd86e1cbdef13d -AUX dictd-1.11.0-avoid-libs-in-LDFLAGS.patch 1850 RMD160 db22a36e976741afa24db145f4d7a085dc9be698 SHA1 07ea8945ac254050648024540e25f3acbabd1579 SHA256 d3a2fd9a24d6503efbcb17fc804d852c5812b4288eef33dae527ab2f46052ce3 -AUX dictd-1.11.0-plugins-install-fix-and-cleanup.patch 754 RMD160 dcb45632342f0d4ae278e1a3073440077f7086c5 SHA1 a1581689e6ba0c8f5cd47ff7b3665374041d460a SHA256 6e909dbf574bd8d63ba870c0bce53cdbfff91a69dfecd2c498c1f2781022d33f -DIST dictd-1.10.11.tar.gz 696755 RMD160 829a71325d59210023b420ffe89cd5477d354cdb SHA1 7d37969424dfef19fa4975b876a0fab4e26fed8c SHA256 a5730cb0c67582d115057b409a6e75d903f56595a6690a7d435e22ae22857899 -DIST dictd-1.11.0.tar.gz 417541 RMD160 982d4adbe613110bfd0e249ce8c8df9c222ab304 SHA1 d3ff60e88e9c83e82605481c9fb919eb21a6565f SHA256 88fa5ff0238d77ce82da0e8ccfc89ed3235e6a8da0347871e77cb79a8ffbf2c1 DIST dictd-1.11.1.tar.gz 416958 RMD160 a212c56b7316751c3501f38bee62bd2e9e097afb SHA1 48a98addfea83faed2b8890b1e1bae22d51d9113 SHA256 0d948667e077a82bc8bfa363243b2a39efb6d469f235ce64f4f3aa9e4682da37 -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 3283 RMD160 9298b95ac20d23376ef385652a33a3057451f2c5 SHA1 465f7a3518777a56faf4bf39a2f540b16bb52da8 SHA256 f8ef98750502db70e9805ff65daf27ecdc5fad81373c9859c15b50598c477f55 -EBUILD dictd-1.11.0.ebuild 2902 RMD160 248e2db59d2d63df3f2cd724ff652898e746ebf1 SHA1 b0a25d7f2feab43ace4520c1e558822376759970 SHA256 b5e4333b5b42b134ce59fdafb3d96d29f31dd3f0370a8b69bc9e1d08f8539432 +DIST dictd-1.11.2.tar.gz 418649 RMD160 f93e8a7a0bbb4e1812288d2ed16889a60e8973ba SHA1 11087cfeffed4e19991e54561d2a6eca1b18d651 SHA256 60e7f44259adee87e952ea5d7e87555685224fb1d1dca24d3735b9feb58c871f EBUILD dictd-1.11.1-r1.ebuild 2763 RMD160 ea9bb63d727451f36bda74da83398632f8674ed8 SHA1 a8be1de335fad53cc859730cae23e3e0521a31b6 SHA256 ca2bb098edd5b89c52327701a4ab4486915b515b0819ffff69eaa01641366432 -EBUILD dictd-1.11.1.ebuild 2417 RMD160 ba13198c20247a26209f553c6f39ef7e954eb40b SHA1 a0cf96eb383bb3f9eab4917d44d60eab260136f6 SHA256 c9732f82cd99d9bdf5196c586c30170d4904b3400f4d10b401aa11aef519cee5 -EBUILD dictd-1.9.14.ebuild 1219 RMD160 d3dc2764fbf9f2d971455de861759fbf50ad9020 SHA1 3ba9e5d537d0c24bf90983de31957d72df894f8c SHA256 3864ccc90523a060f7ebccf443d34f75b3d6af5ac30748c69f62c13a0c57e6ac -MISC ChangeLog 13039 RMD160 ac301b38277b3bd3e797f872d16264771fb06a3f SHA1 795c17a81f990515bfb59f12d78720ad4a13efe6 SHA256 71d3075f60efd074359440c274dabab7e6d0a80fecbc895e37f25a293d639990 +EBUILD dictd-1.11.2.ebuild 2766 RMD160 448ecf41a38b233518dc665f22a36e7efad80210 SHA1 a75de4e8ff87e8f8fd2743de7c7789f18ab18e6a SHA256 fa4a223bcec9bb3cd03d600e299dbd927c942c8eded6e2ec04c12915fda1b944 +MISC ChangeLog 13888 RMD160 a7eac86ba8420670ebe7bfd8e117cec9b29d85c4 SHA1 32754b3210305fb2cc53fb025890e022196f75c0 SHA256 ffcca4d07f96dbd30cf12e84bcc50421038ca27858284cc4e1210ace7ad0fa00 MISC metadata.xml 403 RMD160 27dbd8981c704fbd807a2ff1a2888389d655a776 SHA1 25130136d5d503c6409f8d88ddbee4154d862886 SHA256 c849b2fbde0b28c225ce1524495905e5d7251c2a6cceeeb89c3e2a56b9f0bb6a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkrZdmkACgkQkKaRLQcq0GLHDwCfUrM1UjiAMCpCccvp9RFWvxH1 -BqcAnA7K//CYAdMbSfRMIIikPj7GWTUn -=Ku3m ------END PGP SIGNATURE----- diff --git a/app-text/dictd/dictd-1.10.11-r2.ebuild b/app-text/dictd/dictd-1.10.11-r2.ebuild deleted file mode 100644 index 462666efd464..000000000000 --- a/app-text/dictd/dictd-1.10.11-r2.ebuild +++ /dev/null @@ -1,91 +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-r2.ebuild,v 1.5 2008/12/01 21:41:45 ranger Exp $ - -inherit eutils - -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="~alpha ~amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86" -IUSE="" - -# <gawk-3.1.6 makes tests fail. -DEPEND="sys-apps/coreutils - sys-libs/zlib - || ( >=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" -} - -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 \ - --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-r3.ebuild b/app-text/dictd/dictd-1.10.11-r3.ebuild deleted file mode 100644 index f77260937a30..000000000000 --- a/app-text/dictd/dictd-1.10.11-r3.ebuild +++ /dev/null @@ -1,102 +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-r3.ebuild,v 1.11 2008/12/16 20:27:08 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="alpha amd64 ~hppa ia64 ~mips ppc ~ppc64 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 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() { - # 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.11.0.ebuild b/app-text/dictd/dictd-1.11.0.ebuild deleted file mode 100644 index d2997246782d..000000000000 --- a/app-text/dictd/dictd-1.11.0.ebuild +++ /dev/null @@ -1,95 +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.11.0.ebuild,v 1.6 2008/12/22 20:39:35 armin76 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="~alpha ~amd64 ~hppa ~ia64 ~mips ~sparc ~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.11.1.ebuild b/app-text/dictd/dictd-1.11.2.ebuild index 0e30fc7b33de..9c1c33d28505 100644 --- a/app-text/dictd/dictd-1.11.1.ebuild +++ b/app-text/dictd/dictd-1.11.2.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.11.1.ebuild,v 1.9 2009/06/13 14:07:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.11.2.ebuild,v 1.1 2009/12/27 11:22:56 pva Exp $ + +EAPI="2" inherit eutils @@ -11,8 +13,8 @@ SRC_URI="mirror://sourceforge/dict/${P}.tar.gz" SLOT="0" # We install rfc so - ISOC-rfc LICENSE="GPL-2 ISOC-rfc" -KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="dbi judy" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="dbi judy minimal" # <gawk-3.1.6 makes tests fail. DEPEND="sys-apps/coreutils @@ -20,7 +22,7 @@ DEPEND="sys-apps/coreutils dev-libs/libmaa dbi? ( dev-db/libdbi ) judy? ( dev-libs/judy ) - || ( >=sys-apps/coreutils-6.10 sys-apps/mktemp )" + >=sys-apps/coreutils-6.10" RDEPEND="${DEPEND} >=sys-apps/gawk-3.1.6" @@ -29,22 +31,28 @@ pkg_setup() { enewuser dictd -1 -1 -1 dictd } -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}/dictd-1.10.11-colorit-nopp-fix.patch" } -src_compile() { +src_configure() { econf \ $(use_with dbi plugin-dbi) \ $(use_with judy plugin-judy) \ --sysconfdir=/etc/dict - emake || die "make failed" +} + +src_compile() { + if use minimal; then + emake dictfmt dictzip dictzip || die + else + emake || die "make failed" + fi } src_test() { - if ! hasq userpriv "${FEATURES}"; then + use minimal && return 0 # All tests are for dictd which we don't build... + if [[ ${EUID} -eq 0 ]]; 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" @@ -54,22 +62,29 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install || die "install failed" + if use minimal; then + emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt || die "install failed" + else + 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" + 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 + # conf files. For dict.conf see below. + insinto /etc/dict + for f in 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" + fi - # 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" + insinto /etc/dict + doins "${FILESDIR}/1.10.11/dict.conf" || die + # Install docs + dodoc README TODO ChangeLog ANNOUNCE NEWS || die "installing docs part 1 failed" } pkg_postinst() { diff --git a/app-text/dictd/dictd-1.9.14.ebuild b/app-text/dictd/dictd-1.9.14.ebuild deleted file mode 100644 index 9b125a88243f..000000000000 --- a/app-text/dictd/dictd-1.9.14.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.9.14.ebuild,v 1.18 2009/09/23 16:32:47 patrick 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="" - -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}"/1.9.11-r1/dict.conf - doins "${FILESDIR}"/1.9.11-r1/dictd.conf - doins "${FILESDIR}"/1.9.11-r1/site.info - - # startups for dictd - newinitd "${FILESDIR}"/1.9.11-r1/dictd dictd - newconfd "${FILESDIR}"/1.9.11-r1/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/1.9.11-r1/dict.conf b/app-text/dictd/files/1.9.11-r1/dict.conf deleted file mode 100644 index e06c3d296ec3..000000000000 --- a/app-text/dictd/files/1.9.11-r1/dict.conf +++ /dev/null @@ -1,6 +0,0 @@ -# This is the configuration file for dict. -# Usually all you will ever need here is the server keywords. -# Refer to the dict manpage for other options. -# It will only check the second server if the first fails -server localhost -server dict.org diff --git a/app-text/dictd/files/1.9.11-r1/dictd b/app-text/dictd/files/1.9.11-r1/dictd deleted file mode 100644 index 270e4b5c516d..000000000000 --- a/app-text/dictd/files/1.9.11-r1/dictd +++ /dev/null @@ -1,72 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.9.11-r1/dictd,v 1.3 2004/07/14 21:37:57 agriffis Exp $ - -# NB: Config is in /etc/conf.d/dictd - - -prepconfig() { - if [ ! -e ${DICTDCONF} ] - then - eerror "dictd not started. Config file not found." - return 1 - fi - # if no dictionaries, skip startup. - - # The new way of doing this is to scan /usr/lib/dict and tweek the conf - einfo "Scanning for dictionaries..." - if [ ! -d "${DLIBDIR}" ]; then - eerror "${DLIBDIR} doesn't exist, no dictionaries found." - return 1 - fi - pushd ${DLIBDIR} >/dev/null - INDEXFILES=`ls *.index` - if [ -z "$INDEXFILES" ]; then - eerror "No dictionaries installed." - return 1 - fi - - cat $DICTDCONF | sed -e '/^#LASTLINE/,$d' > $TMPCONF - echo "#LASTLINE" >> $TMPCONF - - CNT=0 - for i in $INDEXFILES - do - DNAME=`echo $i | awk -F . '{print $1;}'` - #two possible names for a matching dictionary, check which is there. - if [ -f ${DNAME}.dict.dz ]; then - DICT=${DNAME}.dict.dz - elif [ -f ${DNAME}.dict ];then - DICT=${DNAME}.dict - else - einfo "Index $i has no matching dictionaray..." - fi - - #ok, go an index, and a dixtionary, append. - echo "database $DNAME { data \"${DLIBDIR}/${DICT}\"" >> $TMPCONF - echo " index \"${DLIBDIR}/$i\" }" >> $TMPCONF - - CNT=`expr $CNT + 1` - done - popd >/dev/null - mv ${TMPCONF} ${DICTDCONF} - einfo "Done, $CNT dictionary indexes found." -} - -depend() { - need localmount -} - -start() { - ebegin "Starting dictd" - prepconfig || return 1 - start-stop-daemon --start --quiet --exec /usr/sbin/dictd -- $EARGS - eend $? -} - -stop() { - ebegin "Stopping dictd" - start-stop-daemon --stop --quiet --exec /usr/sbin/dictd - eend $? -} diff --git a/app-text/dictd/files/1.9.11-r1/dictd.conf b/app-text/dictd/files/1.9.11-r1/dictd.conf deleted file mode 100644 index 4cded974f973..000000000000 --- a/app-text/dictd/files/1.9.11-r1/dictd.conf +++ /dev/null @@ -1,22 +0,0 @@ -# dictd configuration file. -# whipped up by michael conrad tilstra <michael@gentoo.org> - -# Informational message -site site.info - -# who's allowed. You might want to change this. -access { - allow * -} - -# Dictionaries are listed below. -# The initrc script scans /usr/lib/dict and adds all of the dictionaries -# it finds here. -# -# The initrc script will delete everything after the the last line and -# replace it with what it finds. So add all of your things above. -# -# If this is a problem for people, contact me and -# we can work out a different method. -# -#LASTLINE diff --git a/app-text/dictd/files/1.9.11-r1/dictd.confd b/app-text/dictd/files/1.9.11-r1/dictd.confd deleted file mode 100644 index 91b9d43884bc..000000000000 --- a/app-text/dictd/files/1.9.11-r1/dictd.confd +++ /dev/null @@ -1,7 +0,0 @@ -# Config file for /etc/init.d/dictd - -EARGS="-s " -DICTDCONF=/etc/dict/dictd.conf -DLIBDIR=/usr/lib/dict -TMPCONF=/etc/dict/dictd.conf.$$ - diff --git a/app-text/dictd/files/1.9.11-r1/site.info b/app-text/dictd/files/1.9.11-r1/site.info deleted file mode 100644 index 23bfdeb61102..000000000000 --- a/app-text/dictd/files/1.9.11-r1/site.info +++ /dev/null @@ -1,6 +0,0 @@ -Welcome to your dictionary server dictd! - -This is an example site information file. It should contain information -about any restricted databases and how users can obtain access. If may -also contain other random data as you see fit. - 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 deleted file mode 100644 index a3d14a91e1db..000000000000 --- a/app-text/dictd/files/dictd-1.10.11-automatic-plugins_build-failure.patch +++ /dev/null @@ -1,133 +0,0 @@ -https://sourceforge.net/tracker/index.php?func=detail&aid=2218879&group_id=605&atid=300605 - -=== 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/files/dictd-1.10.11-dictd.8-man.patch b/app-text/dictd/files/dictd-1.10.11-dictd.8-man.patch deleted file mode 100644 index 424cc5b17889..000000000000 --- a/app-text/dictd/files/dictd-1.10.11-dictd.8-man.patch +++ /dev/null @@ -1,26 +0,0 @@ -Use @SYSCONFDIR@ instead of /etc/ - -https://sourceforge.net/tracker/index.php?func=detail&aid=2407717&group_id=605&atid=300605 - -Index: dictd/dictd.8.in -=================================================================== ---- dictd.orig/dictd.8.in 2008-01-25 21:25:49.000000000 +0100 -+++ dictd/dictd.8.in 2008-01-25 21:26:42.000000000 +0100 -@@ -120,7 +120,7 @@ - .TP - .BI \-c " file\fR or " \-\-config " file" - Specify configuration file. The default is --.I /etc/dictd.conf -+.I @SYSCONFDIR@/dictd.conf - , but may be changed in the - .I defs.h - file at compile time (DICTD_CONFIG_FILE). -@@ -283,7 +283,7 @@ - .TP - .B Introduction - The configuration file defaults to --.I /etc/dictd.conf -+.I @SYSCONFDIR@/dictd.conf - but can be specified on the command line with the - .B \-c - option (see above). diff --git a/app-text/dictd/files/dictd-1.10.11-dictd.c-alen-init.patch b/app-text/dictd/files/dictd-1.10.11-dictd.c-alen-init.patch deleted file mode 100644 index 68faa156047d..000000000000 --- a/app-text/dictd/files/dictd-1.10.11-dictd.c-alen-init.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1941358&group_id=605&atid=100605 -Index: dictd/dictd.c -=================================================================== ---- dictd.orig/dictd.c 2008-04-13 16:15:58.000000000 +0200 -+++ dictd/dictd.c 2008-04-13 16:16:17.000000000 +0200 -@@ -1455,7 +1455,7 @@ - struct sockaddr_in csin; - int c; - time_t startTime; -- socklen_t alen = 0; -+ socklen_t alen = sizeof(csin); - int detach = 1; - int forceStartup = 0; - int i; diff --git a/app-text/dictd/files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch b/app-text/dictd/files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch deleted file mode 100644 index 1b1753bab6cf..000000000000 --- a/app-text/dictd/files/dictd-1.10.11-dictdplugin_popen-g++-4.3compile.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch for #454819: FTBFS with GCC 4.3: missing #includes - - -Index: dictd/dictdplugin_popen.cpp -=================================================================== ---- dictd.orig/dictdplugin_popen.cpp 2008-01-20 21:58:30.000000000 +0100 -+++ dictd/dictdplugin_popen.cpp 2008-01-20 21:59:06.000000000 +0100 -@@ -43,6 +43,7 @@ - #include <stdio.h> - #include <errno.h> - #include <string> -+#include <climits> - #include <unistd.h> - #include <sstream> - #include <list> diff --git a/app-text/dictd/files/dictd-1.10.11-dictl-konwert.patch b/app-text/dictd/files/dictd-1.10.11-dictl-konwert.patch deleted file mode 100644 index efe8fa3e0110..000000000000 --- a/app-text/dictd/files/dictd-1.10.11-dictl-konwert.patch +++ /dev/null @@ -1,37 +0,0 @@ -Patch for #401666: dictl: doesn't work with DICTL_USE_KONWERT - -https://sourceforge.net/tracker/index.php?func=detail&aid=2407721&group_id=605&atid=300605 - -Index: dictd/dictl.in -=================================================================== ---- dictd.orig/dictl.in 2008-01-20 17:58:41.000000000 +0100 -+++ dictd/dictl.in 2008-01-20 18:02:40.000000000 +0100 -@@ -24,11 +24,25 @@ - # `iconv --help' gives more options than `man iconv' (on my SuSE 9.0 system at least) - # the -c makes iconv omit invalid characters from output - iconv -c -f $1 -t $2 -- else if test "$DICTL_USE_KONWERT"; then -- konwert $1-$2 -+ elif test "$DICTL_USE_KONWERT"; then -+ sedexpr=' -+ /(CP)?(437|8(5[0257]|6[0-69]|74))/ { s//cp\2/; q } -+ /8859_([1-9])/ { s//iso\1/; q } -+ /ANSI_X3.4(-19(68|86))?/ { s//ascii/; q } -+ /(US-)?ASCII/ { s//ascii/; q } -+ /(CP|WINDOWS-)(125[0-8])/ { s//cp\1/; q } -+ /ISO([-_]?8859-|8859)([1-9]|1[01345])/ { s//iso\2/; q } -+ /KOI8-?R/ { s//koi8r/; q } -+ /KOI8-?U/ { s//koi8u/; q } -+ /UTF-?8/ { s//utf8/; q } -+ /VISCII/ { s//viscii/; q } -+ /.*/ { s///; q }' -+ from=`echo "$1" | tr a-z A-Z | sed -r -e "$sedexpr"` -+ to=`echo "$2" | tr a-z A-Z | sed -r -e "$sedexpr"` -+ konwert "$from-$to" - else - recode -f $1..$2 -- fi fi -+ fi - } - - ##################################### diff --git a/app-text/dictd/files/dictd-1.10.11-dictl-translit.patch b/app-text/dictd/files/dictd-1.10.11-dictl-translit.patch deleted file mode 100644 index af994a73a154..000000000000 --- a/app-text/dictd/files/dictd-1.10.11-dictl-translit.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch for #378792: dictl should use iconv's //translit suffix - -https://sourceforge.net/tracker/index.php?func=detail&aid=2407725&group_id=605&atid=300605 - -Index: dictd/dictl.in -=================================================================== ---- dictd.orig/dictl.in 2008-01-21 22:28:01.000000000 +0100 -+++ dictd/dictl.in 2008-01-21 22:28:20.000000000 +0100 -@@ -23,7 +23,7 @@ - if test "$DICTL_USE_ICONV"; then - # `iconv --help' gives more options than `man iconv' (on my SuSE 9.0 system at least) - # the -c makes iconv omit invalid characters from output -- iconv -c -f $1 -t $2 -+ iconv -c -f $1 -t $2//TRANSLIT - elif test "$DICTL_USE_KONWERT"; then - sedexpr=' - /(CP)?(437|8(5[0257]|6[0-69]|74))/ { s//cp\2/; q } 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 deleted file mode 100644 index 73e6b2bd4fda..000000000000 --- a/app-text/dictd/files/dictd-1.11.0-automagic-plugins.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://sourceforge.net/tracker/index.php?func=detail&aid=2218879&group_id=605&atid=300605 - -=== 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 deleted file mode 100644 index 875b63792c6d..000000000000 --- a/app-text/dictd/files/dictd-1.11.0-avoid-libs-in-LDFLAGS.patch +++ /dev/null @@ -1,69 +0,0 @@ -https://sourceforge.net/tracker/index.php?func=detail&aid=2218879&group_id=605&atid=300605 - -=== 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 deleted file mode 100644 index f25cee798b8f..000000000000 --- a/app-text/dictd/files/dictd-1.11.0-plugins-install-fix-and-cleanup.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://sourceforge.net/tracker/index.php?func=detail&aid=2218879&group_id=605&atid=300605 - -=== 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) - |