Version bump, drop old

Package-Manager: portage-2.2.0_alpha76-r1/cvs/Linux x86_64

diff --git a/net-p2p/fms/ChangeLog b/net-p2p/fms/ChangeLog
index 7eb7fecac936d5ed3e3cae64361ef056a6049fc8..416e2cb7f791fa3173cb65210025850cd70fc41b 100644 (file)
--- a/net-p2p/fms/ChangeLog
+++ b/net-p2p/fms/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-p2p/fms
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.24 2011/06/30 20:32:11 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/ChangeLog,v 1.25 2011/11/19 18:12:10 tommy Exp $
+
+  19 Nov 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> -fms-0.3.58.ebuild,
+  -fms-0.3.61.ebuild, +fms-0.3.63.ebuild:
+  Drop old versions
+
+*fms-0.3.63 (19 Nov 2011)
+
+  19 Nov 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +fms-0.3.63.ebuild:
+  Version bump, thanks to a Gentoo user, who sent me the sed lines
+  and the need for <=dev-libs/libpcre-8.12
 
 *fms-0.3.61 (30 Jun 2011)
 

diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index 80368467a529714198d2b2677d446aded30c7ad0..50d5fc6681fcb31626750456e266d83fa6e5e223 100644 (file)
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -4,18 +4,16 @@ Hash: SHA1
 AUX fms 958 RMD160 b1b85941a8d43897a6f362a4bcd98ef142831ac6 SHA1 315bc2805ca5b2e90910a7ee0a6012bd75ef61a2 SHA256 be34254112e953c0cbf29ff6e0baa6c36b063d72c7acc35ccde7d9cc1ab1b649
 AUX fms-use-system-libs.patch 876 RMD160 cf52bd952cafd2286a468c8869e4286aa654e685 SHA1 e7022c9d5a7445ebd10189dfa2a13872e17088e8 SHA256 927c984bab501f5801c26314fff4ae7d8072a6acd4dc8e4c8fd3b548f8e0c471
 AUX quoter.h.patch 273 RMD160 21bf2fb2616abb32b51f112b4d6a386af99416be SHA1 7a84c4981bc14950f5bd87459a20f61857d9187f SHA256 30f34381fa11de12f6fe2ce70e7f6ed048dbbdd355e3c1990e6b2dfb66f042c6
-DIST fms-src-0.3.58.zip 1868749 RMD160 85a67badf1cada89e97f1b9a5d1a19cb558fad3f SHA1 6f70172c34bdaf4ca2441a21c7fd92aa7c48b765 SHA256 5e36750ee8bcfcfc9a572cd65b7c57b1929e3fb283f8c3ea2ab073fb9ed8e149
-DIST fms-src-0.3.61.zip 3281968 RMD160 b2f94fdd36da7081771d64356379e7ca1123a524 SHA1 b844fb9c97e4814bc786b01e556dded5ed02358d SHA256 07caeaa368bbf34580e1c47e4363c5722d5ecb21fdddd71a8209d6ac01f828b0
-EBUILD fms-0.3.58.ebuild 2260 RMD160 efb782396d868d8c1310d24d6ffad1358fcd6d1c SHA1 a816dc4204eeee069f52c8a5af61d682da6457dc SHA256 8ad34c185a43c5a00b6bf4e0b1a3c19e31a24484e6bf522abb0c1a5520747469
-EBUILD fms-0.3.61.ebuild 2260 RMD160 20291ef1223026cedfd506cee4de0ea588bd4744 SHA1 1cf3646d244c8f7f769458d43bfc3518883ca578 SHA256 4dfa1eb4f3bf0c9b5f8db625f4491a0813095c7a520d2b8b3812ebbee34f8ef8
-MISC ChangeLog 4110 RMD160 8a0750d98e3dba6930923529c3eb8a829904317c SHA1 e1376cec4ac0f3fdfbe97ea0f6f0269866034832 SHA256 de54e98c92142b3becf2ee2ce80b8ce706c2f5d4e61f1a4183ecbd95f04cf316
+DIST fms-src-0.3.63.zip 3293932 RMD160 4a66d5987e867efb9336cf0bc0ee5cbf6e7af736 SHA1 0942c49e259fc301235667e072863c576db5b8a0 SHA256 f1c87a3f0b3d3ef592851e19d22b936b761c3bfb350e0c79363b40afc16e9d4f
+EBUILD fms-0.3.63.ebuild 2476 RMD160 ad4b428260735d108b2482ec888f1956050b497f SHA1 81f46b95320320429bcc358746a23f7dfd315ca1 SHA256 54c8295512f4d75d76986dbd7066a210d94b1656dfe3003f67c0df9bcbe12c27
+MISC ChangeLog 4469 RMD160 c2a92be2f366107cae85d7d23d1bbe1ccab382a1 SHA1 293de241afed369e48d5c1b54c91f3b58d070791 SHA256 4c216e465d7e04881f6e47be3e30df29aba3cac4b350d403d3ceecc8332e9bdc
 MISC metadata.xml 337 RMD160 59566d1f3d1ea7a7b6edf83370ba568efa134f2a SHA1 f86cdbfd008e059a7bba5e1377de985293a87224 SHA256 fb5fcbc27def922252dcaedaf932f8c49d37d24245f552be3ecf32571b7abfd1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4M3VoACgkQG7kqcTWJkGdjUgP/U/pEit2eiTeFFXRl17338Tq+
-G2wKQnpEOx75o7qyYK6EqU1V+Bbvdk2rpF7CKxqO0LipJ5xmLL6IOqcQAJ9RRe3o
-5htq0+DTEuajzAno1khQNZk/HMcNyqWVehGxdxRd/DhXJHwcuyCUW2fH/bn9BLv9
-7PuvAaf5J8gZI7uVSu0=
-=maxR
+iJwEAQECAAYFAk7H8YUACgkQG7kqcTWJkGcMNgQA0dkp+hF1C5KsbkQA31ZL90oP
+aY2tQCYnLStViZU5apzustjXScEbQeDu5/jTFMzEsUtw+1TPkA1SZRhFZs3ad6Lf
+a9yuKkh8AwzqPRfaprJSjg/EYlObHy9Gw1IjZJ78b+y7Cgei84jLon1qxDuK1RsP
+KXNGAYseMIHxA9OJu5E=
+=Ab2q
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/fms/fms-0.3.61.ebuild b/net-p2p/fms/fms-0.3.61.ebuild
deleted file mode 100644 (file)
index 02da80a..0000000
--- a/net-p2p/fms/fms-0.3.61.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.61.ebuild,v 1.1 2011/06/30 20:32:11 tommy Exp $
-
-EAPI="2"
-
-inherit eutils cmake-utils
-
-DESCRIPTION="A spam-resistant message board application for Freenet"
-HOMEPAGE="http://freenetproject.org/tools.html"
-SRC_URI="mirror://gentoo/${PN}-src-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="frost"
-
-RDEPEND="virtual/libiconv
-       frost? ( >=dev-libs/libtomcrypt-1.17-r3[libtommath] )
-       >=dev-libs/poco-1.2.9
-       || ( >=dev-db/sqlite-3.6.15 =dev-db/sqlite-3.6.13* =dev-db/sqlite-3.6.12* =dev-db/sqlite-3.6.11* =dev-db/sqlite-3.6.6.2* )"
-DEPEND="${RDEPEND}
-       app-arch/unzip"
-
-S=${WORKDIR}
-
-pkg_setup() {
-       enewgroup freenet
-       enewuser freenet -1 -1 /var/freenet freenet
-}
-
-src_prepare() {
-       edos2unix src/http/pages/showfilepage.cpp
-       epatch "${FILESDIR}"/${PN}-use-system-libs.patch
-       sed -i "s:LTC_PKCS:LTC_LTC_PKCS:g" src/freenet/frostidentity.cpp
-}
-
-src_configure() {
-       local mycmakeargs="-DI_HAVE_READ_THE_README=ON \
-               -DUSE_BUNDLED_SQLITE=OFF \
-               -DDO_CHARSET_CONVERSION=ON \
-               $(cmake-utils_use frost FROST_SUPPORT)"
-       use frost && append-flags -DLTM_DESC
-       cmake-utils_src_configure
-}
-
-src_install() {
-       insinto /var/freenet/fms
-       dobin "${CMAKE_BUILD_DIR}"/fms || die
-       doins *.htm || die "doinstall failed"
-       doins -r fonts images styles translations || die
-       fperms -R o-rwx /var/freenet/fms/ /usr/bin/fms
-       fowners -R freenet:freenet /var/freenet/fms/ /usr/bin/fms
-       doinitd "${FILESDIR}/fms" || die "installing init.d file failed"
-       dodoc readme.txt || die "installing doc failed"
-}
-
-pkg_postinst() {
-       if ! has_version 'net-p2p/freenet' ; then
-               ewarn "FMS needs a freenet node to up-/download #ssages."
-               ewarn "Please make sure to have a node you can connect to"
-               ewarn "or install net-p2p/freenet to get FMS working."
-       fi
-       elog "By default, the FMS NNTP server will listen on port 1119,"
-       elog "and the web configuration interface will be running at"
-       elog "http://localhost:8080. For more information, read"
-       elog "${ROOT}usr/share/doc/${PF}/readme.txt.bz2"
-       if use frost; then
-               elog " "
-               elog "You need to enable frost on the config page"
-               elog "and restart fms for frost support."
-       fi
-}

diff --git a/net-p2p/fms/fms-0.3.58.ebuild b/net-p2p/fms/fms-0.3.63.ebuild
similarity index 82%
rename from net-p2p/fms/fms-0.3.58.ebuild
rename to net-p2p/fms/fms-0.3.63.ebuild
index a3ffea0e9f4d2e7d5ca4f0179c7bf36847fff158..1c9fb69e4deaf71dfc18f3ae0831b39c7934d359 100644 (file)
--- a/net-p2p/fms/fms-0.3.58.ebuild
+++ b/net-p2p/fms/fms-0.3.63.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.58.ebuild,v 1.2 2011/06/14 17:36:54 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/fms-0.3.63.ebuild,v 1.1 2011/11/19 18:12:10 tommy Exp $
 
 EAPI="2"
 
@@ -18,7 +18,10 @@ IUSE="frost"
 RDEPEND="virtual/libiconv
        frost? ( >=dev-libs/libtomcrypt-1.17-r3[libtommath] )
        >=dev-libs/poco-1.2.9
-       || ( >=dev-db/sqlite-3.6.15 =dev-db/sqlite-3.6.13* =dev-db/sqlite-3.6.12* =dev-db/sqlite-3.6.11* =dev-db/sqlite-3.6.6.2* )"
+       >=dev-db/sqlite-3.6.15
+       <dev-libs/libpcre-8.13"
+#added dependency on <=dev-libs/libpcre-8.12 instead of blocking higher versions,
+#to prevent some issues with blocker resolution in portage
 DEPEND="${RDEPEND}
        app-arch/unzip"
 
@@ -33,6 +36,8 @@ src_prepare() {
        edos2unix src/http/pages/showfilepage.cpp
        epatch "${FILESDIR}"/${PN}-use-system-libs.patch
        sed -i "s:LTC_PKCS:LTC_LTC_PKCS:g" src/freenet/frostidentity.cpp
+       sed -i 's:"../../../include/fmsapp.h":"../include/fmsapp.h":' src/*.cpp
+       sed -i 's:"../../../include/fmsapp.h":"../../include/fmsapp.h":' src/*/*.cpp
 }
 
 src_configure() {