| 1 |
commit: 37954b06d82a931048a60c2e4d6d2d9730f154f5 |
| 2 |
Author: Jack Todaro <solpeth <AT> posteo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 1 03:46:18 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 1 08:04:30 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37954b06 |
| 7 |
|
| 8 |
dev-haskell/x11: bump up to 1.9.1 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 11 |
Signed-off-by: Jack Todaro <solpeth <AT> posteo.org> |
| 12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-haskell/x11/Manifest | 1 + |
| 15 |
dev-haskell/x11/files/x11-1.9-cabal-3.patch | 8 +++++ |
| 16 |
dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch | 10 ++++++ |
| 17 |
dev-haskell/x11/x11-1.9.1.ebuild | 44 ++++++++++++++++++++++++++ |
| 18 |
4 files changed, 63 insertions(+) |
| 19 |
|
| 20 |
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest |
| 21 |
index 1917fa8c8d7..d36936af2a2 100644 |
| 22 |
--- a/dev-haskell/x11/Manifest |
| 23 |
+++ b/dev-haskell/x11/Manifest |
| 24 |
@@ -1,3 +1,4 @@ |
| 25 |
DIST X11-1.6.1.1.tar.gz 188628 BLAKE2B 8ce533c89812c1b1e5babd1025773919518f021396d67bda3cc87b0ec61b241ebe27ca40ff4ae9fca9562a73263b71b64ceda098ff809a9a688230d5a71efcde SHA512 d5f58a7ab2450e145e890187e8dc7b43e286d2a95414a605e549cbf48568ef0d89f662870b2010eecba3b8fdd2a3a57214d33fc8775426e7e23ffad727b4e144 |
| 26 |
DIST X11-1.6.1.2.tar.gz 188612 BLAKE2B f75e16010000fc28f899a008c547d6c7b3275f17eafface70f42cc9ef0542514090fccc42b69835df48f261b70f598e8484e99f563a41156b7613b555351292e SHA512 f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b |
| 27 |
DIST X11-1.8.tar.gz 191331 BLAKE2B a539da2bb0231c4749a948574b99e7fa4d30e21b94d1eaa81f1d9f79885b16d5fa60578db868cceb842e27e6b84fa6e3c7a7d1cb757d4df26dfaf2786fc2f4e6 SHA512 bb647bcc7504b3e4267d6a8a6ec73766fe62d7f5b3966bfa037742849c4a1128ea22608dd8353a6035aedc2046c53fae65c8b54f2933a4b896297159f5c2e59c |
| 28 |
+DIST X11-1.9.1.tar.gz 190698 BLAKE2B ba8ee8f26b6e7cacb2334248d3609863277817b2c06d5eb7d8491ee2804691bcc49bb1588e3f2308acacebb739d9d7920507969729ef651e9b0600aa5acbc1f4 SHA512 6fc3c8b71681ba45d14c4b709c58760d7bfcb3e6363ef6c79e3d3ecce8f5a30bda877141cea9de73094fc00fa064d23d36f1f8fa61aa65f2d9d75acd1808eaa7 |
| 29 |
|
| 30 |
diff --git a/dev-haskell/x11/files/x11-1.9-cabal-3.patch b/dev-haskell/x11/files/x11-1.9-cabal-3.patch |
| 31 |
new file mode 100644 |
| 32 |
index 00000000000..fc4ea175de0 |
| 33 |
--- /dev/null |
| 34 |
+++ b/dev-haskell/x11/files/x11-1.9-cabal-3.patch |
| 35 |
@@ -0,0 +1,8 @@ |
| 36 |
+--- a/Setup.hs |
| 37 |
++++ b/Setup.hs |
| 38 |
+@@ -3,4 +3,4 @@ module Main (main) where |
| 39 |
+ import Distribution.Simple |
| 40 |
+ |
| 41 |
+ main :: IO () |
| 42 |
+-main = defaultMainWithHooks defaultUserHooks |
| 43 |
++main = defaultMainWithHooks autoconfUserHooks |
| 44 |
|
| 45 |
diff --git a/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch b/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch |
| 46 |
new file mode 100644 |
| 47 |
index 00000000000..69bc33c0d21 |
| 48 |
--- /dev/null |
| 49 |
+++ b/dev-haskell/x11/files/x11-1.9-no-LDFLAGS.patch |
| 50 |
@@ -0,0 +1,10 @@ |
| 51 |
+Don't persist LDFLAGS into package database. |
| 52 |
+ |
| 53 |
+https://bugs.gentoo.org/609624 |
| 54 |
+--- a/X11.buildinfo.in |
| 55 |
++++ b/X11.buildinfo.in |
| 56 |
+@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@ |
| 57 |
+ cc-options: @X_CFLAGS@ @CPPFLAGS@ |
| 58 |
+-ld-options: @X_LIBS@ @LDFLAGS@ |
| 59 |
++ld-options: @X_LIBS@ |
| 60 |
+ extra-libraries: @EXTRA_LIBRARIES@ |
| 61 |
|
| 62 |
diff --git a/dev-haskell/x11/x11-1.9.1.ebuild b/dev-haskell/x11/x11-1.9.1.ebuild |
| 63 |
new file mode 100644 |
| 64 |
index 00000000000..cb805ed19d6 |
| 65 |
--- /dev/null |
| 66 |
+++ b/dev-haskell/x11/x11-1.9.1.ebuild |
| 67 |
@@ -0,0 +1,44 @@ |
| 68 |
+# Copyright 1999-2020 Gentoo Authors |
| 69 |
+# Distributed under the terms of the GNU General Public License v2 |
| 70 |
+ |
| 71 |
+EAPI=7 |
| 72 |
+ |
| 73 |
+# ebuild generated by hackport 0.6.9999 |
| 74 |
+ |
| 75 |
+CABAL_FEATURES="lib profile haddock hoogle hscolour" |
| 76 |
+inherit haskell-cabal |
| 77 |
+ |
| 78 |
+MY_PN="X11" |
| 79 |
+MY_P="${MY_PN}-${PV}" |
| 80 |
+ |
| 81 |
+DESCRIPTION="A binding to the X11 graphics library" |
| 82 |
+HOMEPAGE="https://github.com/xmonad/X11" |
| 83 |
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" |
| 84 |
+ |
| 85 |
+LICENSE="BSD" |
| 86 |
+SLOT="0/${PV}" |
| 87 |
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
| 88 |
+IUSE="+xinerama" |
| 89 |
+ |
| 90 |
+RDEPEND="dev-haskell/data-default:=[profile?] |
| 91 |
+ >=dev-lang/ghc-7.4.1:= |
| 92 |
+ x11-libs/libX11 |
| 93 |
+ x11-libs/libXext |
| 94 |
+ x11-libs/libXrandr |
| 95 |
+ x11-libs/libXScrnSaver |
| 96 |
+ xinerama? ( x11-libs/libXinerama ) |
| 97 |
+" |
| 98 |
+DEPEND="${RDEPEND} |
| 99 |
+ >=dev-haskell/cabal-1.6 |
| 100 |
+" |
| 101 |
+ |
| 102 |
+PATCHES=( |
| 103 |
+ "${FILESDIR}"/${PN}-1.9-no-LDFLAGS.patch |
| 104 |
+) |
| 105 |
+ |
| 106 |
+S="${WORKDIR}/${MY_P}" |
| 107 |
+ |
| 108 |
+src_configure() { |
| 109 |
+ haskell-cabal_src_configure \ |
| 110 |
+ --configure-option=$(use_with xinerama) |
| 111 |
+} |
Archives