Added version 1.9 (bug #143137), removed version 1.7 and put KEYWORDS in alphabetical order.

Package-Manager: portage-2.1.1_pre5-r2

4 files changed, 77 insertions, 3 deletions

diff --git a/x11-libs/libmatchbox/ChangeLog b/x11-libs/libmatchbox/ChangeLog
index db12d8b03673..96dd33b54e8e 100644
--- a/x11-libs/libmatchbox/ChangeLog
+++ b/x11-libs/libmatchbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libmatchbox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.5 2006/08/07 17:00:38 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.6 2006/08/17 15:47:51 yvasilev Exp $
+
+*libmatchbox-1.9 (17 Aug 2006)
+
+  17 Aug 2006; <yvasilev@gentoo.org> -libmatchbox-1.7.ebuild,
+  libmatchbox-1.8.ebuild, +libmatchbox-1.9.ebuild:
+  Added version 1.9 (bug #143137), removed version 1.7 and put KEYWORDS in
+  alphabetical order.
 
   07 Aug 2006; <yvasilev@gentoo.org> libmatchbox-1.8.ebuild:
   Added ~arm keyword.
diff --git a/x11-libs/libmatchbox/files/digest-libmatchbox-1.9 b/x11-libs/libmatchbox/files/digest-libmatchbox-1.9
new file mode 100644
index 000000000000..3b844c7cc8f6
--- /dev/null
+++ b/x11-libs/libmatchbox/files/digest-libmatchbox-1.9
@@ -0,0 +1,3 @@
+MD5 9f73e7515cc4679171a5db180dc1343b libmatchbox-1.9.tar.bz2 316575
+RMD160 5c72d1a86de1d6b4ffbe07b6a80ac705d2633fb3 libmatchbox-1.9.tar.bz2 316575
+SHA256 db01e218e8d09540459c8f7c5698c159cd84c3d5b8caa9763bf0e5a35f6edf00 libmatchbox-1.9.tar.bz2 316575
diff --git a/x11-libs/libmatchbox/libmatchbox-1.8.ebuild b/x11-libs/libmatchbox/libmatchbox-1.8.ebuild
index a19d96a284ee..f99a47be8b87 100644
--- a/x11-libs/libmatchbox/libmatchbox-1.8.ebuild
+++ b/x11-libs/libmatchbox/libmatchbox-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2006-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.8.ebuild,v 1.3 2006/08/07 17:00:38 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.8.ebuild,v 1.4 2006/08/17 15:47:51 yvasilev Exp $
 
 inherit eutils libtool
 
@@ -10,7 +10,7 @@ SRC_URI="http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~arm"
+KEYWORDS="~arm ~x86"
 IUSE="debug doc jpeg pango png truetype X xsettings"
 
 RDEPEND="|| ( (	x11-libs/libXext
diff --git a/x11-libs/libmatchbox/libmatchbox-1.9.ebuild b/x11-libs/libmatchbox/libmatchbox-1.9.ebuild
new file mode 100644
index 000000000000..0c68a0efe6ae
--- /dev/null
+++ b/x11-libs/libmatchbox/libmatchbox-1.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2006-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9.ebuild,v 1.1 2006/08/17 15:47:51 yvasilev Exp $
+
+inherit eutils libtool
+
+DESCRIPTION="The Matchbox Library."
+HOMEPAGE="http://projects.o-hand.com/matchbox/"
+SRC_URI="http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~arm ~x86"
+IUSE="debug doc jpeg pango png truetype X xsettings"
+
+RDEPEND="|| ( (	x11-libs/libXext
+		truetype? ( x11-libs/libXft ) )
+		virtual/x11 )
+	pango? ( x11-libs/pango )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	xsettings? ( x11-libs/libxsettings-client )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	# Bug #138135
+	if use truetype && use pango; then
+		ewarn "You have both the truetype and pango USE flags set, pango"
+		ewarn "overrides and disables the XFT support truetype enables."
+		ewarn "If this isn't what you intended you should stop the build!"
+		ebeep 3
+		epause 3
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	elibtoolize
+}
+
+src_compile() {
+	econf	$(use_enable debug) \
+		$(use_enable doc doxygen-docs) \
+		$(use_enable truetype xft) \
+		$(use_enable pango) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable xsettings) \
+		$(use_with X x) \
+		|| die "Configuration failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS Changelog INSTALL NEWS README
+	use doc && dohtml doc/html/*
+}