From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Sep 2020 14:09:07 +0100 Subject: gentoo resync : 02.09.2020 --- dev-haskell/hsql-sqlite3/Manifest | 3 ++- .../hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch | 14 ++++++++++++++ dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild | 6 +++++- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch (limited to 'dev-haskell/hsql-sqlite3') diff --git a/dev-haskell/hsql-sqlite3/Manifest b/dev-haskell/hsql-sqlite3/Manifest index 692391e9829e..cccf08ffebd4 100644 --- a/dev-haskell/hsql-sqlite3/Manifest +++ b/dev-haskell/hsql-sqlite3/Manifest @@ -1,3 +1,4 @@ +AUX hsql-sqlite3-1.8.2-cabal22.patch 452 BLAKE2B f66a32f251a836948de482e5b67fc385ee87d8c360efe9018d06690821363561462eba24585b436331365df518ac4e1db0d5f7a7c47f0311df3046bbd07c483b SHA512 197c91990be179a65f7bf76efd822f3f5444d4c10c47a2b475897f6d76dbf2175f4d71370cbe4b443383cd6e48c004d1c8da0988d5b6a0c3322cf5a9ddb5f35c DIST hsql-sqlite3-1.8.2.tar.gz 4752 BLAKE2B 84a77f8bc835b4337d99cdd974f7cd5960f7b52faeb4c06e2572d31887bdae3d2cdf6bf00d4c44eae7a4f98b116a134e950353932ef9cb43d557b11b85ffff96 SHA512 962d4396a3844f4d1b4f4be6f6d81e085f1deaa2e7ca0776a93aed4f34cb5e40edab96d568fa3a086ea0c4017dff7de8dd1d25e81ad27840c844ed885af5e42e -EBUILD hsql-sqlite3-1.8.2-r1.ebuild 594 BLAKE2B c92cca1c58dd04c5b5ca252dcafcbdf7fbbb62ae123cb691e062b817db9b32b8240cfab1a873dd12651575188d92cb58e7c5257fd98eaadee9a69b9d34a52f21 SHA512 34476d087b71852a09de0197e68dce097f027144268b81ada12521c00685b1b45576fae8403ff7d9e3d0ee66696fda5fe756c6def46a65a6ee90d875b863c949 +EBUILD hsql-sqlite3-1.8.2-r1.ebuild 641 BLAKE2B 877fe806afe98d9bc7668a13624cacc34329da1828055e8c637f30d496fb6d595b78a112957d1912466888ad57a0b942f22981e10c09a49ac75ad219b8bb4585 SHA512 9bf6d7cbe23ef99e22fbadf19b3304d2bf4b283370a580dcad1dc42c385a3c35c8e2d40af647edbb9f6f767ec92d3e1c632096ff6dc60f30e935fa244b8cdf9a MISC metadata.xml 369 BLAKE2B f9a73abb5c6344b68e146cfee342fe63e5830c73d3e2110d1c7e70a4ef59879ab555e0824ed76dc60ea18c0f03a10ec16cd52af3d7af051926078d712bd30a21 SHA512 382796958de20ebe7a8894a85d41e3a695861647909b57e3816475ea0d54fbdc6f57895101b85d4f35a4046d11d3cd356c26d0602143d03bc954cc9ccd485abb diff --git a/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch b/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch new file mode 100644 index 000000000000..b421fbb9362a --- /dev/null +++ b/dev-haskell/hsql-sqlite3/files/hsql-sqlite3-1.8.2-cabal22.patch @@ -0,0 +1,14 @@ +--- a/Setup.lhs ++++ b/Setup.lhs +@@ -3,2 +3,3 @@ + \begin{code} ++{-# LANGUAGE CPP #-} + import Control.Monad(when) +@@ -13,3 +14,7 @@ import Distribution.PackageDescription + ,emptyBuildInfo) ++#if MIN_VERSION_Cabal(2,2,0) ++import Distribution.PackageDescription.PrettyPrint(writeHookedBuildInfo) ++#else + import Distribution.PackageDescription.Parse(writeHookedBuildInfo) ++#endif + import Distribution.Simple(UserHooks(preConf,postConf) ,simpleUserHooks diff --git a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild index 0f537298e791..5385305b3fd8 100644 --- a/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild +++ b/dev-haskell/hsql-sqlite3/hsql-sqlite3-1.8.2-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 # ebuild generated by hackport 0.3.1.9999 @@ -22,3 +22,7 @@ RDEPEND=">=dev-db/sqlite-3.0 >=dev-lang/ghc-6.10.4:=" DEPEND="${RDEPEND} >=dev-haskell/cabal-0" + +PATCHES=( + "${FILESDIR}"/${P}-cabal22.patch +) -- cgit v1.2.3