diff options
Diffstat (limited to 'dev-haskell/x11')
| -rw-r--r-- | dev-haskell/x11/Manifest | 6 | ||||
| -rw-r--r-- | dev-haskell/x11/x11-1.10.2.ebuild (renamed from dev-haskell/x11/x11-1.10-r1.ebuild) | 19 | ||||
| -rw-r--r-- | dev-haskell/x11/x11-1.9.2.ebuild | 44 |
3 files changed, 12 insertions, 57 deletions
diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest index 91248ade250c..615e501827b4 100644 --- a/dev-haskell/x11/Manifest +++ b/dev-haskell/x11/Manifest @@ -1,6 +1,4 @@ AUX x11-1.9-no-LDFLAGS.patch 296 BLAKE2B 8ab586c978cbf6a224bd4edb65be6e19f7135ad5572c28fc732ab0e12b975840a08178cc8edead2589b6ea3b027c02967fbb013f6b95bc4a7d6fae85f7f508f5 SHA512 0937dda56fe2590c75bd3c1be5bfaaf87b9dfd4c960978143cc689f8e762c9a2f7ad056029c850e8fd52e367d75816866c8136635e1056da2101bed68a88bbc1 -DIST X11-1.10.tar.gz 192493 BLAKE2B 7c951eaf3a009302b2b7d3a9aeb866b908e99f60b408aaae75375e0fbdd12254c283ad27a0e2354cc0c6be745fa507c0bf64a763c548037a640eb8927923246e SHA512 7976a151edf9a54e4278f65903ec6b177211f8209039c4e2747abddd9ed86db51a6e65c5359297443b5ade513d9ca8e452cff033d9d0261f3fb027113765bb89 -DIST X11-1.9.2.tar.gz 190757 BLAKE2B cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec SHA512 e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41 -EBUILD x11-1.10-r1.ebuild 976 BLAKE2B caf534229e8b89c113286cdbd901fc6d4d58a6ae4697c96c64d8c8de8671942077e0cf78f935a6f49ac0a84b1d622c364eb6e2ecdd29189cf620b5af958f0ff3 SHA512 c4ca945f9f0391500073358b47f535572b52b52a171188adc2cfe8ad3806f1a9a7952f7ae57d20fea8258302b0119ec1167f2712bb5eb37451d2bcf05a224b52 -EBUILD x11-1.9.2.ebuild 941 BLAKE2B 82064b0310daa30aa54e6c285de9999bcf0588f77ca3269c63f022932bb3e349e66258da90e4d816cadd17d36a676e04c38ed15a96ef1a05f4239c7fcdcc4375 SHA512 69273118f44da0a00ff34bdc73da22f1ad274243e8f568fbce5afdb877bd61e24e554a942d31d39d98917e135782b7aefdb5598ba7b367ccb909baf7980cfc91 +DIST x11-1.10.2.tar.gz 192634 BLAKE2B a42e24aea6287a0af7f1b96fd9603d494fc010c9659a69ffcc46bb8670993271fb67061f5026f201bf730dbe0670d485f2a4197cdba5fc6bbd4f36fca4d6dd8e SHA512 5013dc359e081900193efd201c38c41ca73bc8dae3610e8e3b46e42aad7ae4a5917ecd3219d77e40141be7179963aaa2454032c820945e93ff4310ef359b2df4 +EBUILD x11-1.10.2.ebuild 964 BLAKE2B 7e81a2cb1b5909ea0c1b4822d717381237851397f901cc38b362c1c9263593cfef5d908c825c3899d87a561fa4b5ca0cc287111298da3fcfa8d8f43afe7fa963 SHA512 3e80a4053048a73cb360178b6c1f5f3e28c91b4e30dd110b7664f1880404875ff555ed3f44cf3ac7dcc2498ff35172baf10e1c8fe3a3154b1aa32be6061b011a MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4 diff --git a/dev-haskell/x11/x11-1.10-r1.ebuild b/dev-haskell/x11/x11-1.10.2.ebuild index a9792bfb0016..794d6d454c07 100644 --- a/dev-haskell/x11/x11-1.10-r1.ebuild +++ b/dev-haskell/x11/x11-1.10.2.ebuild @@ -3,30 +3,30 @@ EAPI=8 -# ebuild generated by hackport 0.7.9999 -#hackport: flags:-pedantic +# ebuild generated by hackport 0.7.2.1.9999 +#hackport: flags: -pedantic +CABAL_PN="X11" + CABAL_FEATURES="lib profile haddock hoogle hscolour" inherit haskell-cabal -MY_PN="X11" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" - DESCRIPTION="A binding to the X11 graphics library" HOMEPAGE="https://github.com/xmonad/X11" -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+xinerama" -# remember to add libXScrnSaver manually on bumps, or src_configure will fail. +# add +xinerama to IUSE and RDEPEND on libXScrnSaver and libXinerama below RDEPEND=">=dev-haskell/data-default-class-0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?] >=dev-lang/ghc-8.4.3:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver + xinerama? ( x11-libs/libXinerama ) + " DEPEND="${RDEPEND} >=dev-haskell/cabal-2.2.0.1 @@ -34,5 +34,6 @@ DEPEND="${RDEPEND} src_configure() { haskell-cabal_src_configure \ - --flag=-pedantic + --flag=-pedantic \ + --configure-option=$(use_with xinerama) } diff --git a/dev-haskell/x11/x11-1.9.2.ebuild b/dev-haskell/x11/x11-1.9.2.ebuild deleted file mode 100644 index 9c2823eba68f..000000000000 --- a/dev-haskell/x11/x11-1.9.2.ebuild +++ /dev/null @@ -1,44 +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 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -MY_PN="X11" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A binding to the X11 graphics library" -HOMEPAGE="https://github.com/xmonad/X11" -SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+xinerama" - -RDEPEND="dev-haskell/data-default:=[profile?] - >=dev-lang/ghc-7.4.1:= - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXScrnSaver - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.6 -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9-no-LDFLAGS.patch -) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - haskell-cabal_src_configure \ - --configure-option=$(use_with xinerama) -} |