* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/darcs/files/, dev-vcs/darcs/
@ 2020-08-15 20:15 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2020-08-15 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 21bdeddb28b45dc1f9ca0c09496136f99c116d1b
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 20:15:00 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 20:15:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21bdeddb
dev-vcs/darcs: fix PACKAG_VERSION definition
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/737236
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-vcs/darcs/darcs-2.16.1.ebuild | 2 ++
dev-vcs/darcs/files/darcs-2.16.1-curl.patch | 25 +++++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/dev-vcs/darcs/darcs-2.16.1.ebuild b/dev-vcs/darcs/darcs-2.16.1.ebuild
index f1a923a53c4..e33373b0340 100644
--- a/dev-vcs/darcs/darcs-2.16.1.ebuild
+++ b/dev-vcs/darcs/darcs-2.16.1.ebuild
@@ -70,6 +70,8 @@ DEPEND="${RDEPEND}
curl? ( virtual/pkgconfig )
"
+PATCHES=("${FILESDIR}"/${PN}-2.16.1-curl.patch)
+
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag curl curl) \
diff --git a/dev-vcs/darcs/files/darcs-2.16.1-curl.patch b/dev-vcs/darcs/files/darcs-2.16.1-curl.patch
new file mode 100644
index 00000000000..8216ce2e8c4
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.16.1-curl.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/737236
+
+--- a/src/hscurl.c
++++ b/src/hscurl.c
+@@ -11,6 +11,9 @@
+ #define ENABLE_PIPELINING
+ #endif
+
++/* workaround for https://bugs.gentoo.org/737236 */
++#include "cabal_macros.h"
++
+ enum RESULT_CODES
+ {
+ RESULT_OK = 0,
+@@ -46,6 +49,10 @@ struct UrlData
+
+ static int debug = 0;
+ #ifndef _WIN32
++#ifndef PACKAGE_VERSION
++/* workaround for https://bugs.gentoo.org/737236 */
++# define PACKAGE_VERSION CURRENT_PACKAGE_VERSION
++#endif
+ static const char user_agent[] =
+ "darcs/" PACKAGE_VERSION " libcurl/" LIBCURL_VERSION;
+ #else
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/darcs/files/, dev-vcs/darcs/
@ 2020-10-24 8:52 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2020-10-24 8:52 UTC (permalink / raw
To: gentoo-commits
commit: 85f0bf0bab33e5c8e2b0f0bf56e4dabde471d02d
Author: Jack Todaro <solpeth <AT> posteo <DOT> org>
AuthorDate: Fri Oct 23 05:50:01 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 08:52:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f0bf0b
dev-vcs/darcs: drop old
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Jack Todaro <solpeth <AT> posteo.org>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-vcs/darcs/Manifest | 1 -
dev-vcs/darcs/darcs-2.16.2.ebuild | 103 ----------------------------
dev-vcs/darcs/files/darcs-2.16.1-curl.patch | 25 -------
3 files changed, 129 deletions(-)
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 7b03eed8f41..24f69ce3683 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -1,3 +1,2 @@
DIST darcs-2.14.5.tar.gz 1063677 BLAKE2B 7f38aa09d5af53e68829a9181f1981eccd173e2af5a044d100758164b668297303aed947ffc579ea1977e4a1f2820d1954b5c5428e429e5ff42ee238e0043611 SHA512 75f89dc920eb9a417e86bcbf185b0ba35e284a0a0c6bbd27c7dec46c4f143f5c37f0559a1ff1b3d3bd39ebdca98fa3a7420bee5e179c1bef0b0fc203e04e0484
-DIST darcs-2.16.2.tar.gz 1242738 BLAKE2B b402c8b2987097d10c61ffd312cc58b788625759cf199a774af8efb9b001d8440705eed75f3dbdd3ca120256c5e2efb9ddda73e12da31b7b07ba9d10ca33de8b SHA512 ee43e570227a5f462e064b71323755d1179809c24ff83a904aefa32494c4655b41b4b3291411b5abc1e1e75be894cde6070aa072b51905ddf8fc2934973b25cb
DIST darcs-2.16.3.tar.gz 1244848 BLAKE2B 59754a782a456b3c6bba2b382d485b5de00ae3fc7ac1107bcf89877aff9650eb823704eb23912a83643685612a0cfc84ccf2af2303b52249d9e7a3e55c08c7b7 SHA512 267787c5b3111a20158858b42a8b9c2698b80dc40f7d340175e26d74b955643cefffc2f4de9811fa26464eac2e79913150fb3cd73871275725d10a690b9d73c3
diff --git a/dev-vcs/darcs/darcs-2.16.2.ebuild b/dev-vcs/darcs/darcs-2.16.2.ebuild
deleted file mode 100644
index ac19fb3449e..00000000000
--- a/dev-vcs/darcs/darcs-2.16.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="a distributed, interactive, smart revision control system"
-HOMEPAGE="http://darcs.net/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl +terminfo +threaded"
-
-RESTRICT=test # conflict-fight-failure (Darcs3) (PatienceDiff): [Failed]
-
-RDEPEND=">=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
- >=dev-haskell/attoparsec-0.13.0.1:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
- >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
- >=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.3.3:=[profile?]
- >=dev-haskell/constraints-0.11:=[profile?] <dev-haskell/constraints-0.13:=[profile?]
- >=dev-haskell/cryptonite-0.24:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?]
- >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
- >=dev-haskell/fgl-5.5.2.3:=[profile?] <dev-haskell/fgl-5.8:=[profile?]
- >=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
- >=dev-haskell/haskeline-0.7.2:=[profile?] <dev-haskell/haskeline-0.9:=[profile?]
- >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
- >=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
- >=dev-haskell/http-types-0.12.1:=[profile?] <dev-haskell/http-types-0.12.4:=[profile?]
- >=dev-haskell/memory-0.14:=[profile?] <dev-haskell/memory-0.16:=[profile?]
- >=dev-haskell/mmap-0.5.9:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
- >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
- >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
- >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
- >=dev-haskell/old-time-1.1.0.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
- >=dev-haskell/parsec-3.1.9:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
- >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
- >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
- >=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.6:=[profile?]
- >=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
- >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
- >=dev-haskell/temporary-1.2.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
- >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
- >=dev-haskell/unix-compat-0.5:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
- >=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
- >=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
- >=dev-haskell/zip-archive-0.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
- >=dev-haskell/zlib-0.6.1.2:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
- >=dev-lang/ghc-8.2.1:=
- curl? ( net-misc/curl )
- terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-2.2 <dev-haskell/cabal-3.3
- test? ( >=dev-haskell/cmdargs-0.10.10 <dev-haskell/cmdargs-0.11
- >=dev-haskell/exceptions-0.6
- >=dev-haskell/findbin-0.0.5 <dev-haskell/findbin-0.1
- >=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7
- >=dev-haskell/leancheck-0.9 <dev-haskell/leancheck-0.10
- >=dev-haskell/monad-control-0.3.2 <dev-haskell/monad-control-1.1
- >=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
- >=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
- <dev-haskell/system-fileio-0.4
- >=dev-haskell/system-filepath-0.4.7 <dev-haskell/system-filepath-0.5
- >=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9
- >=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4
- >=dev-haskell/test-framework-leancheck-0.0.1 <dev-haskell/test-framework-leancheck-0.1
- >=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4
- dev-haskell/transformers-base )
- curl? ( virtual/pkgconfig )
-"
-
-PATCHES=("${FILESDIR}"/${PN}-2.16.1-curl.patch)
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag curl curl) \
- --flag=executable \
- --flag=-hpc \
- --flag=http \
- --flag=library \
- --flag=-optimize \
- --flag=pkgconfig \
- --flag=-rts \
- --flag=-static \
- $(cabal_flag terminfo terminfo) \
- $(cabal_flag threaded threaded) \
- --flag=-warn-as-error
-}
-
-src_install() {
- haskell-cabal_src_install
-
- # fixup perms in such an awkward way
- mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
- doman "${S}/darcs.1"
-}
diff --git a/dev-vcs/darcs/files/darcs-2.16.1-curl.patch b/dev-vcs/darcs/files/darcs-2.16.1-curl.patch
deleted file mode 100644
index 8216ce2e8c4..00000000000
--- a/dev-vcs/darcs/files/darcs-2.16.1-curl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/737236
-
---- a/src/hscurl.c
-+++ b/src/hscurl.c
-@@ -11,6 +11,9 @@
- #define ENABLE_PIPELINING
- #endif
-
-+/* workaround for https://bugs.gentoo.org/737236 */
-+#include "cabal_macros.h"
-+
- enum RESULT_CODES
- {
- RESULT_OK = 0,
-@@ -46,6 +49,10 @@ struct UrlData
-
- static int debug = 0;
- #ifndef _WIN32
-+#ifndef PACKAGE_VERSION
-+/* workaround for https://bugs.gentoo.org/737236 */
-+# define PACKAGE_VERSION CURRENT_PACKAGE_VERSION
-+#endif
- static const char user_agent[] =
- "darcs/" PACKAGE_VERSION " libcurl/" LIBCURL_VERSION;
- #else
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-24 8:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-15 20:15 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/darcs/files/, dev-vcs/darcs/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2020-10-24 8:52 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox