commit:     e73f93f7990c0785ab693f649571dd87e1d85638
Author:     Jack Todaro <solpeth <AT> posteo <DOT> org>
AuthorDate: Tue Aug 25 23:20:15 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 23:25:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73f93f7

dev-haskell/x11: remove old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Jack Todaro <solpeth <AT> posteo.org>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/x11/Manifest                       |  4 ---
 dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch | 12 -------
 dev-haskell/x11/metadata.xml                   | 14 +++-----
 dev-haskell/x11/x11-1.6.1.1.ebuild             | 40 -----------------------
 dev-haskell/x11/x11-1.6.1.2.ebuild             | 41 ------------------------
 dev-haskell/x11/x11-1.8-r1.ebuild              | 43 -------------------------
 dev-haskell/x11/x11-1.9.1.ebuild               | 44 --------------------------
 7 files changed, 4 insertions(+), 194 deletions(-)

diff --git a/dev-haskell/x11/Manifest b/dev-haskell/x11/Manifest
index 1e0d42edafb..a3548cf32d9 100644
--- a/dev-haskell/x11/Manifest
+++ b/dev-haskell/x11/Manifest
@@ -1,5 +1 @@
-DIST X11-1.6.1.1.tar.gz 188628 BLAKE2B 
8ce533c89812c1b1e5babd1025773919518f021396d67bda3cc87b0ec61b241ebe27ca40ff4ae9fca9562a73263b71b64ceda098ff809a9a688230d5a71efcde
 SHA512 
d5f58a7ab2450e145e890187e8dc7b43e286d2a95414a605e549cbf48568ef0d89f662870b2010eecba3b8fdd2a3a57214d33fc8775426e7e23ffad727b4e144
-DIST X11-1.6.1.2.tar.gz 188612 BLAKE2B 
f75e16010000fc28f899a008c547d6c7b3275f17eafface70f42cc9ef0542514090fccc42b69835df48f261b70f598e8484e99f563a41156b7613b555351292e
 SHA512 
f8d01c806f59a20ad6d6632367b80ca972ebc2df9ba65fe23338d5fa1b933049c08609d25be690d87ba6dbe9cd1ba0f5a95e491c8abaca9eaec078ca03e0e01b
-DIST X11-1.8.tar.gz 191331 BLAKE2B 
a539da2bb0231c4749a948574b99e7fa4d30e21b94d1eaa81f1d9f79885b16d5fa60578db868cceb842e27e6b84fa6e3c7a7d1cb757d4df26dfaf2786fc2f4e6
 SHA512 
bb647bcc7504b3e4267d6a8a6ec73766fe62d7f5b3966bfa037742849c4a1128ea22608dd8353a6035aedc2046c53fae65c8b54f2933a4b896297159f5c2e59c
-DIST X11-1.9.1.tar.gz 190698 BLAKE2B 
ba8ee8f26b6e7cacb2334248d3609863277817b2c06d5eb7d8491ee2804691bcc49bb1588e3f2308acacebb739d9d7920507969729ef651e9b0600aa5acbc1f4
 SHA512 
6fc3c8b71681ba45d14c4b709c58760d7bfcb3e6363ef6c79e3d3ecce8f5a30bda877141cea9de73094fc00fa064d23d36f1f8fa61aa65f2d9d75acd1808eaa7
 DIST X11-1.9.2.tar.gz 190757 BLAKE2B 
cae5bd1e689bec914d612f59070ab5da3f604d33991ba885d83257337ca6d53089374e427f8bcfee2dd7504687b49b830ac98ab5947021c6c2d6e500123203ec
 SHA512 
e9658c33b6dcbb6a42f1cc4a8976365506af94ddc15c32f73205b453934ef3232f3b383f8365b6aa6e69b51acfda4a0f3a8038f3164523b33781139a80582a41

diff --git a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch 
b/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
deleted file mode 100644
index f1d5c179036..00000000000
--- a/dev-haskell/x11/files/x11-1.8-no-LDFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Don't persist LDFLAGS into package database.
-
-https://bugs.gentoo.org/609624
-diff --git a/X11.buildinfo.in b/X11.buildinfo.in
-index 6925939..6a18b58 100644
---- a/X11.buildinfo.in
-+++ b/X11.buildinfo.in
-@@ -5,3 +5,3 @@ buildable: @BUILD_PACKAGE_BOOL@
- cc-options: @X_CFLAGS@ @CPPFLAGS@
--ld-options: @X_LIBS@ @LDFLAGS@
-+ld-options: @X_LIBS@
- extra-libraries: @EXTRA_LIBRARIES@

diff --git a/dev-haskell/x11/metadata.xml b/dev-haskell/x11/metadata.xml
index 4c6b85a8182..e9eac3ea967 100644
--- a/dev-haskell/x11/metadata.xml
+++ b/dev-haskell/x11/metadata.xml
@@ -6,15 +6,9 @@
                <name>Gentoo Haskell</name>
        </maintainer>
        <longdescription>
-               A Haskell binding to the X11 graphics library.
-               The binding is a direct translation of the C binding; for
-               documentation of these calls, refer to "The Xlib Programming
-               Manual", available online at 
&lt;http://tronche.com/gui/x/xlib/&gt;.
+               A Haskell binding to the X11 graphics library. The binding is a 
direct
+               translation of the C binding; for documentation of these calls, 
refer
+               to \&quot;The Xlib Programming Manual\&quot;, available online 
at
+               &lt;http://tronche.com/gui/x/xlib/&gt;.
        </longdescription>
-       <use>
-               <flag name="screensaver">whether to build XScreenSaver.</flag>
-       </use>
-       <upstream>
-               <remote-id type="github">haskell-pkg-janitors/X11</remote-id>
-       </upstream>
 </pkgmetadata>

diff --git a/dev-haskell/x11/x11-1.6.1.1.ebuild 
b/dev-haskell/x11/x11-1.6.1.1.ebuild
deleted file mode 100644
index 248061d6054..00000000000
--- a/dev-haskell/x11/x11-1.6.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2
-
-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/haskell-pkg-janitors/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="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-               >=dev-lang/ghc-7.4.1:=
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXrandr
-               screensaver? ( x11-libs/libXScrnSaver )
-               xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-               >=dev-haskell/cabal-1.2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-       haskell-cabal_src_configure \
-               --configure-option=$(use_with xinerama) \
-               --configure-option=$(use_with screensaver xscreensaver)
-}

diff --git a/dev-haskell/x11/x11-1.6.1.2.ebuild 
b/dev-haskell/x11/x11-1.6.1.2.ebuild
deleted file mode 100644
index 5c8d1e671ce..00000000000
--- a/dev-haskell/x11/x11-1.6.1.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.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/haskell-pkg-janitors/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="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-       >=dev-lang/ghc-7.4.1:=
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXrandr
-               screensaver? ( x11-libs/libXScrnSaver )
-               xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-       >=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-       haskell-cabal_src_configure \
-               --configure-option=$(use_with xinerama) \
-               --configure-option=$(use_with screensaver xscreensaver)
-}

diff --git a/dev-haskell/x11/x11-1.8-r1.ebuild 
b/dev-haskell/x11/x11-1.8-r1.ebuild
deleted file mode 100644
index 9f9524f235d..00000000000
--- a/dev-haskell/x11/x11-1.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.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="+screensaver +xinerama"
-
-RDEPEND="dev-haskell/data-default:=[profile?]
-       >=dev-lang/ghc-7.4.1:=
-       x11-libs/libX11
-       x11-libs/libXext
-       x11-libs/libXrandr
-       screensaver? ( x11-libs/libXScrnSaver )
-       xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-       >=dev-haskell/cabal-1.6
-"
-
-PATCHES=("${FILESDIR}"/${P}-no-LDFLAGS.patch)
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-       haskell-cabal_src_configure \
-               --configure-option=$(use_with xinerama) \
-               --configure-option=$(use_with screensaver xscreensaver)
-}

diff --git a/dev-haskell/x11/x11-1.9.1.ebuild b/dev-haskell/x11/x11-1.9.1.ebuild
deleted file mode 100644
index 6f5d9102b17..00000000000
--- a/dev-haskell/x11/x11-1.9.1.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.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)
-}

Reply via email to