From 55a15a7167899b4a8b1b836e9e28f2e425e78e4b Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 18 Apr 2009 20:48:17 +0000 Subject: [PATCH] net-mail/mailman: add mhonarc patches git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1110 6952d904-891a-0410-993b-d76249ca496b --- net-mail/mailman/ChangeLog | 4 ++ net-mail/mailman/Manifest | 11 ++++- .../mhonarc-2.6.16-list-output-order.patch | 45 +++++++++++++++++++ net-mail/mailman/mailman-2.1.12.ebuild | 36 +++++++++++++-- 4 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 net-mail/mailman/files/mhonarc-2.6.16-list-output-order.patch diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog index 728da5c6..864fad8f 100644 --- a/net-mail/mailman/ChangeLog +++ b/net-mail/mailman/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.115 2008/11/14 11:07:45 hanno Exp $ + 18 Apr 2009; Mario Fetka + +files/mhonarc-2.6.16-list-output-order.patch, mailman-2.1.12: + add mhonarc patches + 26 Feb 2009; Mario Fetka mailman-2.1.12.ebuild: disable dir check diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest index c554c83d..1e4b8d39 100644 --- a/net-mail/mailman/Manifest +++ b/net-mail/mailman/Manifest @@ -9,9 +9,16 @@ AUX mailman-python2.6-exceptions-quickfix.patch 1079 RMD160 fac2683997eec1c38e11 AUX mailman-python2.6.patch 7094 RMD160 d854b5465331ccde122022d0dfb6174bdc677702 SHA1 c687cd2f485abfc348fc67e067a845e83d57956d SHA256 8f28e2c81865b71874768dafcc4e9d6548dd61998776d99f90dc9edb54018f75 AUX mailman.conf 385 RMD160 bec3c71140385fa88078ffb38be14bfd8ec068c6 SHA1 64e15fce12231bac8e9a5dd831d9c4f134df77a1 SHA256 fdd86c4a72318ade5dfe0f075ce62470979f93d8a4c862993dc32e7bdb422eab AUX mailman.rc 597 RMD160 be0a574298a1d8d547a4ca76f864dd5fee9b897d SHA1 f464f5ba7310934d300a9af7c614fdf7498f7d2b SHA256 ef4f5482cf68ba44a0fbb83acde29295bd8dcb6512d259d14387dfc29beeb625 +AUX mhonarc-2.6.16-list-output-order.patch 1430 RMD160 b8c28140e30fc78e69942d0a49d9bc1cd19e6eef SHA1 866a17bfde975a905cda2787417f6f8db651cf80 SHA256 91b1661bc495fef894832c739dec533231e0fe0376fc20e94d4d9aade7cd486f +DIST MHonArc-2.6.16.tar.bz2 1562490 RMD160 31d6659fabdb00b4d4594eda9f5985bd5f3f33b8 SHA1 8b803a610805fe736036c3dcd2596e2e416a886b SHA256 7e6f113bd307d818005cc1c55004df94ce338b6ca64043ae3f89d86ce8d56df1 +DIST exitstatus-2.1.11-0.1.patch.gz 5270 RMD160 afbc435ce38764db7e1fbd070345b19296bb7c26 SHA1 9be1dc7aaf1c344737cf28cb7e4d773b3c205e11 SHA256 7312812155d3fdee4f1921ff442b48222ea992320cca1a7b957e0c6a6b9fa468 +DIST htdig-2.1.11-0.1.patch.gz 61311 RMD160 07c20e91a94e5fbfc76c8f8747ee9b1ffe64300b SHA1 d49dbe8b9bc278ec9d42d936d79cc48cff534eff SHA256 e603257259a0e5255dbae82ac64c3ee2b0fe4d947b43c3b9e750571d8f829335 +DIST indexing-2.1.11-0.1.patch.gz 8203 RMD160 74ea4379f70e9a0dad2b7ffe61648c7f8c5f9c3c SHA1 55e9b1e8c6ff96ee6b5e0c0039fc4329ba3ee573 SHA256 bb940388dfbc19a52bdd62569d6212d09b2a3ceb6cb5a1fe43b5f1551da10433 DIST mailman-2.1.11.tgz 7992229 RMD160 667297720aae9fef07600eab6fbf3d2cfc205c8b SHA1 068f1927f4d8dd0896b5064bdf6d102798491b72 SHA256 66f2e1d27b6d1f253a8ebbe218cacaab947e6b421f7513fbaea2314b24f06bda DIST mailman-2.1.12.tgz 8010027 RMD160 94d8d132bb37180bf4c02ccd2a5fb3862ce13b94 SHA1 6d6281f7ce322e271f0259321f4d8931ff46e6ae SHA256 5e9313252cc2eea774c453131e7f3fe3a5873ebce26628c5504cdc318d563ddd +DIST mhonarc-2.1.11-0.2.patch.gz 15544 RMD160 b5cef27e3b4051a891c7ec2650ec3ba9e5d5e5ec SHA1 1d94f9ba1854f0c4035df6eba8aefd65c0ed4898 SHA256 5165d9b91c3cd244f181884733f7e571bd2937bfadb56aefd179c0fffad39583 +DIST modinc-2.1.11-0.1.patch.gz 1166 RMD160 d9c8a37aecb54a2b2a016bb0879eed7a2bc48401 SHA1 2f924d2d9c838891a0bea4bd51212f3910b6678f SHA256 80181af1e0be4cddfc899ed27e92853944a19a0f71792bdca3940b6c609f507e EBUILD mailman-2.1.11.ebuild 5953 RMD160 266387bb518f8e72bc0fe02257ef68ffc19eca03 SHA1 b1b924f0125863a12fbd80390ca44e2c835d0ff7 SHA256 fb02ac4a6806158884b17199d95cb27d17cebd420d947e0941714c9d6bde3b26 -EBUILD mailman-2.1.12.ebuild 5800 RMD160 c678946b7e7512ff481d14323516eebd54e67e18 SHA1 e7aeaf6e20d5510f079857342c073102a6c437a0 SHA256 dad3d0e8260a69a80634928227096cc3a33da8d6138773c2cc1002f23ebb8853 -MISC ChangeLog 15858 RMD160 7a83bb0d6d45a7dfa307f9a8d511391ab7fad7bb SHA1 d676e634220bc3c558137b353f4ee5136991c599 SHA256 969cfd8cc8fa1a5ba6161955dc3d053b2ee9da24a61f1e17bedb1bd5bf0c750e +EBUILD mailman-2.1.12.ebuild 7344 RMD160 28a9571b1a82b156e9971b78747f3302ac2b1c01 SHA1 2bed9b33cc0bb5940c20cdf33ffa6220e15948c8 SHA256 d19b23f2dc49db37125e9b2198e677a8e7b7f017d332569297d83acbc8b15963 +MISC ChangeLog 15997 RMD160 cff2466068a1a805627470b235291739d1752bdd SHA1 bff8168edecb901f6ef3e00f92655c335009d738 SHA256 0083dfc3205db8364db26fed84803468e1cf1d8e14bde608c1b54c189931666d MISC metadata.xml 218 RMD160 30759d93f0209fdd74f29393ae54999fe6b2bdff SHA1 486b307ff1dae10aef7d18472460a21bc2decdfb SHA256 09421ca1b9299683d07f68ddbbd3ed97251dac613121b420841a3251da7fcb89 diff --git a/net-mail/mailman/files/mhonarc-2.6.16-list-output-order.patch b/net-mail/mailman/files/mhonarc-2.6.16-list-output-order.patch new file mode 100644 index 00000000..de4b7a56 --- /dev/null +++ b/net-mail/mailman/files/mhonarc-2.6.16-list-output-order.patch @@ -0,0 +1,45 @@ +--- MHonArc-2.6.16/lib/mhthread.pl.orig 2006-09-08 20:46:48.000000000 -0700 ++++ MHonArc-2.6.16/lib/mhthread.pl 2006-09-08 20:47:14.000000000 -0700 +@@ -406,22 +406,22 @@ + ## Decrement level count if their were replies + --$level if ($haverepls); + ++ ## Close entry text ++ if ($attop) { ++ &print_thread_var($handle, $idx, \$TTOPEND); ++ } elsif (!$single && !$didtliend) { ++ &print_thread_var($handle, $idx, \$TLIEND); ++ } ++ + ## Check for missing messages + if ($DoMissingMsgs && !($attop || $single)) { + for ($i=$depth; $i > 0; --$i) { +- &print_thread_var($handle, $idx, \$TLINONEEND); + &print_thread_var($handle, $idx, \$TSUBLISTEND) + if $level <= $TLEVELS; ++ &print_thread_var($handle, $idx, \$TLINONEEND); + --$level; + } + } +- +- ## Close entry text +- if ($attop) { +- &print_thread_var($handle, $idx, \$TTOPEND); +- } elsif (!$single && !$didtliend) { +- &print_thread_var($handle, $idx, \$TLIEND); +- } + } + + ##--------------------------------------------------------------------------- +@@ -636,9 +636,9 @@ + ## Check for missing messages + if ($DoMissingMsgs && !($attop || $single)) { + for ($i = $depth; $i > 0; $i--) { +- $ret .= &expand_thread_var($idx, \$TSLICELINONEEND); + $ret .= &expand_thread_var($idx, \$TSLICESUBLISTEND) + if $level <= $TSLICELEVELS; ++ $ret .= &expand_thread_var($idx, \$TSLICELINONEEND); + $level--; + } + } + diff --git a/net-mail/mailman/mailman-2.1.12.ebuild b/net-mail/mailman/mailman-2.1.12.ebuild index cd15055c..ef0408af 100644 --- a/net-mail/mailman/mailman-2.1.12.ebuild +++ b/net-mail/mailman/mailman-2.1.12.ebuild @@ -2,11 +2,25 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.11.ebuild,v 1.4 2008/08/15 15:26:26 nixnut Exp $ -inherit eutils python multilib +inherit eutils python multilib perl-app + +MH_VER="2.6.16" +MM_VER="2.1.11" +INDEXING_VER="0.1" +HTDIG_VER="0.1" +EXITSTATUS_VER="0.1" +MODINC_VER="0.1" +MHONARC_VER="0.2" DESCRIPTION="A python-based mailing list server with an extensive web interface" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" -HOMEPAGE="http://www.list.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz + http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${MH_VER}.tar.bz2 + http://www.openinfo.co.uk/mm/patches/444879/indexing-${MM_VER}-${INDEXING_VER}.patch.gz + http://www.openinfo.co.uk/mm/patches/444884/htdig-${MM_VER}-${HTDIG_VER}.patch.gz + http://www.openinfo.co.uk/mm/patches/644797/exitstatus-${MM_VER}-${EXITSTATUS_VER}.patch.gz + http://www.openinfo.co.uk/mm/patches/760567/modinc-${MM_VER}-${MODINC_VER}.patch.gz + http://www.openinfo.co.uk/mm/patches/mhonarc/mhonarc-${MM_VER}-${MHONARC_VER}.patch.gz" +HOMEPAGE="http://www.list.org/ http://www.openinfo.co.uk/mm/ http://www.mhonarc.org/" SLOT="0" LICENSE="GPL-2" @@ -17,6 +31,7 @@ DEPEND=">=dev-lang/python-2.3 virtual/mta virtual/cron virtual/httpd-cgi" +RDEPEND="!net-mail/mhonarc" pkg_setup() { INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"} @@ -40,6 +55,13 @@ src_unpack() { cd "${S}" # epatch "${FILESDIR}/${PN}-2.1.8_rc1-directory-check.patch" || die "patch failed." epatch "${FILESDIR}/${PN}-2.1.9-icons.patch" || die "patch failed." + epatch "${DISTDIR}/indexing-${MM_VER}-${INDEXING_VER}.patch.gz" || die "patch failed." + epatch "${DISTDIR}/htdig-${MM_VER}-${HTDIG_VER}.patch.gz" || die "patch failed." + epatch "${DISTDIR}/exitstatus-${MM_VER}-${EXITSTATUS_VER}.patch.gz" || die "patch failed." + epatch "${DISTDIR}/modinc-${MM_VER}-${MODINC_VER}.patch.gz" || die "patch failed." + epatch "${DISTDIR}/mhonarc-${MM_VER}-${MHONARC_VER}.patch.gz" || die "patch failed." + cd ${WORKDIR}/MHonArc-${MH_VER} + epatch "${FILESDIR}"/mhonarc-${MH_VER}-list-output-order.patch } src_compile() { @@ -54,6 +76,8 @@ src_compile() { || die "configure failed" emake || die "make failed" + cd ${WORKDIR}/MHonArc-${MH_VER} + perl-app_src_compile } src_install () { @@ -105,6 +129,12 @@ src_install () { chmod 2770 "${D}/${VAR_PREFIX}/qfiles" chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" + cd ${WORKDIR}/MHonArc-${MH_VER} + sed -e "s|-prefix /usr |-docpath '${D}/usr/share/doc/${PF}/mhonarc' -prefix '${D}/${INSTALLDIR}/mhonarc' -libpath '${D}/${SITE_LIB}' |g" -i Makefile + perl-module_src_install + prepalldocs + + } pkg_postinst() {