* [gentoo-commits] gentoo-x86 commit in dev-haskell/x11: x11-1.2.1.ebuild ChangeLog x11-1.4.0.ebuild x11-1.4.1.ebuild
@ 2008-05-25 11:14 Lennart Kolmodin (kolmodin)
0 siblings, 0 replies; only message in thread
From: Lennart Kolmodin (kolmodin) @ 2008-05-25 11:14 UTC (permalink / raw
To: gentoo-commits
kolmodin 08/05/25 11:14:18
Modified: x11-1.2.1.ebuild ChangeLog x11-1.4.0.ebuild
x11-1.4.1.ebuild
Log:
Add USE="xinerama" to most recent dev-haskell/x11 versions. This fixes bug #223377.
(Portage version: 2.1.4.4)
Revision Changes Path
1.4 dev-haskell/x11/x11-1.2.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/x11-1.2.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/x11-1.2.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/x11-1.2.1.ebuild?r1=1.3&r2=1.4
Index: x11-1.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.2.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- x11-1.2.1.ebuild 13 Dec 2007 17:34:10 -0000 1.3
+++ x11-1.2.1.ebuild 25 May 2008 11:14:18 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.2.1.ebuild,v 1.3 2007/12/13 17:34:10 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.2.1.ebuild,v 1.4 2008/05/25 11:14:18 kolmodin Exp $
CABAL_FEATURES="lib profile haddock"
inherit haskell-cabal
@@ -24,6 +24,6 @@
# Sadly Setup.hs in the ghc-6.6.1 extralibs was not tested with Cabal-1.1.6.x
src_unpack() {
- unpack "${A}"
+ unpack ${A}
sed -i -e "/type Hook/ s/UserHooks/Maybe UserHooks/" "${S}/Setup.hs"
}
1.7 dev-haskell/x11/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/ChangeLog?r1=1.6&r2=1.7
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 15 Dec 2007 23:11:47 -0000 1.6
+++ ChangeLog 25 May 2008 11:14:18 -0000 1.7
@@ -1,6 +1,14 @@
# ChangeLog for dev-haskell/x11
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.6 2007/12/15 23:11:47 kolmodin Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.7 2008/05/25 11:14:18 kolmodin Exp $
+
+ 25 May 2008; Lennart Kolmodin <kolmodin@gentoo.org> x11-1.2.1.ebuild,
+ x11-1.4.0.ebuild, x11-1.4.1.ebuild:
+ Add IUSE="xinerama" and add missing dependency on libXinerama.
+ This requires >=cabal-1.2.3.0.
+ Reported by Prashanth Mundkur <prashanth.mundkur@gmail.com>.
+ This fixes bug #223377.
+ Fix minor repoman issue with x11-1.2.1.
*x11-1.4.1 (16 Dec 2007)
1.3 dev-haskell/x11/x11-1.4.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/x11-1.4.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/x11-1.4.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/x11-1.4.0.ebuild?r1=1.2&r2=1.3
Index: x11-1.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x11-1.4.0.ebuild 15 Dec 2007 16:38:04 -0000 1.2
+++ x11-1.4.0.ebuild 25 May 2008 11:14:18 -0000 1.3
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.0.ebuild,v 1.2 2007/12/15 16:38:04 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.0.ebuild,v 1.3 2008/05/25 11:14:18 kolmodin Exp $
CABAL_FEATURES="lib profile haddock"
-CABAL_MIN_VERSION=1.1.6
-inherit haskell-cabal
+CABAL_MIN_VERSION=1.2.3.0
+inherit haskell-cabal eutils autotools
MY_PN="X11"
MY_P="${MY_PN}-${PV}"
@@ -16,9 +16,23 @@
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
+IUSE="xinerama"
DEPEND=">=dev-lang/ghc-6.4.2
- x11-libs/libX11"
+ x11-libs/libX11
+ xinerama? ( x11-libs/libXinerama )"
S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack $A
+
+ cd "${S}"
+ epatch "${FILESDIR}/${PN}-1.4.2-with-xinerama.patch"
+ eautoreconf
+}
+
+src_compile() {
+ CABAL_CONFIGURE_FLAGS="--configure-option=$(use_with xinerama)"
+ cabal_src_compile
+}
1.2 dev-haskell/x11/x11-1.4.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/x11-1.4.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/x11-1.4.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/x11/x11-1.4.1.ebuild?r1=1.1&r2=1.2
Index: x11-1.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x11-1.4.1.ebuild 15 Dec 2007 23:11:47 -0000 1.1
+++ x11-1.4.1.ebuild 25 May 2008 11:14:18 -0000 1.2
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.1.ebuild,v 1.1 2007/12/15 23:11:47 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.4.1.ebuild,v 1.2 2008/05/25 11:14:18 kolmodin Exp $
CABAL_FEATURES="lib profile haddock"
-CABAL_MIN_VERSION=1.1.6
-inherit haskell-cabal
+CABAL_MIN_VERSION=1.2.3.0
+inherit haskell-cabal eutils autotools
MY_PN="X11"
MY_P="${MY_PN}-${PV}"
@@ -16,9 +16,23 @@
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
+IUSE="xinerama"
DEPEND=">=dev-lang/ghc-6.4.2
- x11-libs/libX11"
+ x11-libs/libX11
+ xinerama? ( x11-libs/libXinerama )"
S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack $A
+
+ cd "${S}"
+ epatch "${FILESDIR}/${PN}-1.4.2-with-xinerama.patch"
+ eautoreconf
+}
+
+src_compile() {
+ CABAL_CONFIGURE_FLAGS="--configure-option=$(use_with xinerama)"
+ cabal_src_compile
+}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-25 11:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-25 11:14 [gentoo-commits] gentoo-x86 commit in dev-haskell/x11: x11-1.2.1.ebuild ChangeLog x11-1.4.0.ebuild x11-1.4.1.ebuild Lennart Kolmodin (kolmodin)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox