summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-06-09 12:41:48 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-06-09 12:41:48 +0000
commit5162e83a66a766edad81fbef4af26e5724cb325d (patch)
treecfa9300f290cc43ba8c894d90e6230f33577f51f /x11-libs/libXcomposite
parentMask poppler 0.14 as it breaks Gtk/GNOME apps. (diff)
downloadhistorical-5162e83a66a766edad81fbef4af26e5724cb325d.tar.gz
historical-5162e83a66a766edad81fbef4af26e5724cb325d.tar.bz2
historical-5162e83a66a766edad81fbef4af26e5724cb325d.zip
Version bump. Drop old.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/libXcomposite')
-rw-r--r--x11-libs/libXcomposite/ChangeLog8
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.4.0.ebuild19
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.4.2.ebuild24
3 files changed, 31 insertions, 20 deletions
diff --git a/x11-libs/libXcomposite/ChangeLog b/x11-libs/libXcomposite/ChangeLog
index ae619d461936..bfe10f1feb04 100644
--- a/x11-libs/libXcomposite/ChangeLog
+++ b/x11-libs/libXcomposite/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/libXcomposite
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/ChangeLog,v 1.63 2010/01/19 20:04:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/ChangeLog,v 1.64 2010/06/09 12:38:46 scarabeus Exp $
+
+*libXcomposite-0.4.2 (09 Jun 2010)
+
+ 09 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ -libXcomposite-0.4.0.ebuild, +libXcomposite-0.4.2.ebuild:
+ Version bump. Drop old.
19 Jan 2010; Raúl Porcel <armin76@gentoo.org> libXcomposite-0.4.1.ebuild:
s390 stable wrt #294958
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.0.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.0.ebuild
deleted file mode 100644
index f77eb4a0bbb2..000000000000
--- a/x11-libs/libXcomposite/libXcomposite-0.4.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.4.0.ebuild,v 1.11 2009/05/15 15:08:59 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org Xcomposite library"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXext
- >=x11-proto/compositeproto-0.4
- x11-proto/xproto"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.2.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.2.ebuild
new file mode 100644
index 000000000000..68c76fb66ea9
--- /dev/null
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.4.2.ebuild,v 1.1 2010/06/09 12:38:46 scarabeus Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xcomposite library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXfixes
+ x11-libs/libXext
+ >=x11-proto/compositeproto-0.4
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ doc? ( app-text/xmlto )"
+
+src_configure() {
+ CONFIGURE_OPTIONS="$(use_with doc xmlto)"
+ xorg-2_src_configure
+}