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

(Portage version: 2.1.1_pre5-r2)
 (Signed Manifest commit)

3 files changed, 19 insertions, 86 deletions

diff --git a/x11-libs/libmatchbox/Manifest b/x11-libs/libmatchbox/Manifest
index 506f0dd49890..970ac8741bbc 100644
--- a/x11-libs/libmatchbox/Manifest
+++ b/x11-libs/libmatchbox/Manifest
@@ -1,34 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST libmatchbox-1.7.tar.bz2 250754 RMD160 fa6bea1e2489fd3feae452103f6a2aa619454305 SHA1 3e27b0525d7a10d777a49b8f59fb59b48f2b6d1b SHA256 f6e545e7e9bc35e1dd1b9a89ffd29d6cf1f2c975fc15ada4dbe0525871f6762e
 DIST libmatchbox-1.8.tar.bz2 303304 RMD160 420158db32bd1b5968645b12faa9f333bee9e61e SHA1 e0422b2e3722134334bd80b4e3e064507459e8bc SHA256 a675f7b5b10dabf4d2951b629dd8d638219ec91078acd497aac4fcf2008a1c5b
-EBUILD libmatchbox-1.7.ebuild 1572 RMD160 05ce9a5f191bfccbd31c71c6e596b1eeb44fe205 SHA1 56c3dd9da966cf26d397b441aad39ad78d82e82e SHA256 8c938ee5b08be58e6d1e1ca10431d24a9411ced57740871cf26e52bc55cfb498
-MD5 5c72fa01b5a7e85d144c09acc21df98f libmatchbox-1.7.ebuild 1572
-RMD160 05ce9a5f191bfccbd31c71c6e596b1eeb44fe205 libmatchbox-1.7.ebuild 1572
-SHA256 8c938ee5b08be58e6d1e1ca10431d24a9411ced57740871cf26e52bc55cfb498 libmatchbox-1.7.ebuild 1572
-EBUILD libmatchbox-1.8.ebuild 1577 RMD160 00faaa4ae37e0f8b7893ac08d3ecf050dfdd8b86 SHA1 ae8b10aa80e3a943eca2bce6a9b25a409d56e7e4 SHA256 3969c52cc6b1c761c236a2a7aca8d3d7e3b743983bafee50a2a969c7170f0ff3
-MD5 a6a4cf645faad1c31bcf60de86a693de libmatchbox-1.8.ebuild 1577
-RMD160 00faaa4ae37e0f8b7893ac08d3ecf050dfdd8b86 libmatchbox-1.8.ebuild 1577
-SHA256 3969c52cc6b1c761c236a2a7aca8d3d7e3b743983bafee50a2a969c7170f0ff3 libmatchbox-1.8.ebuild 1577
-MISC ChangeLog 878 RMD160 7aa4fdb92d094f68ce3ba7553b038273faa5aaf3 SHA1 56f84e0240ceb5a0e2f011c1291e287d0713c099 SHA256 f167bfe090d484a5e9d3273de325cfdd0c5d8f4f989aa44964ff6c4b30dd5c6a
-MD5 208299ecd04bef3b69bc9211206a02b4 ChangeLog 878
-RMD160 7aa4fdb92d094f68ce3ba7553b038273faa5aaf3 ChangeLog 878
-SHA256 f167bfe090d484a5e9d3273de325cfdd0c5d8f4f989aa44964ff6c4b30dd5c6a ChangeLog 878
+DIST libmatchbox-1.9.tar.bz2 316575 RMD160 5c72d1a86de1d6b4ffbe07b6a80ac705d2633fb3 SHA1 7820b2723581c20db92d8a36e1a75d4a0c57579a SHA256 db01e218e8d09540459c8f7c5698c159cd84c3d5b8caa9763bf0e5a35f6edf00
+EBUILD libmatchbox-1.8.ebuild 1577 RMD160 7772f17a149268b091874494382303b7b5ca400a SHA1 a5afe792168b116ae8119a91ef0ea208be63dd73 SHA256 dd1d1540186eea037acb1eb8b0bd58077f56df49786a5dcae74f01773c2da06c
+MD5 0a15f032ab237ec2f8613f4c6d1e0cd3 libmatchbox-1.8.ebuild 1577
+RMD160 7772f17a149268b091874494382303b7b5ca400a libmatchbox-1.8.ebuild 1577
+SHA256 dd1d1540186eea037acb1eb8b0bd58077f56df49786a5dcae74f01773c2da06c libmatchbox-1.8.ebuild 1577
+EBUILD libmatchbox-1.9.ebuild 1577 RMD160 8d3837aaf3153d7e7ef0b598720dc42e64bb23b4 SHA1 ab7173bdd04f997141228fbda901bbbadec2ae73 SHA256 308cb4372209cd9b019405399ecdd6878d481dbb87b0b84d7c4284b4042a3470
+MD5 870e94c380a0d79ed4cdceab7d0efb43 libmatchbox-1.9.ebuild 1577
+RMD160 8d3837aaf3153d7e7ef0b598720dc42e64bb23b4 libmatchbox-1.9.ebuild 1577
+SHA256 308cb4372209cd9b019405399ecdd6878d481dbb87b0b84d7c4284b4042a3470 libmatchbox-1.9.ebuild 1577
+MISC ChangeLog 1121 RMD160 401f4a5aa4b11cc73ef84c26ff84c3927a06ffe1 SHA1 439e90d0a8d4406863505ae0931d111701bc7403 SHA256 7624a56d69a74f3da5b534e7d430587e0dfe58963e167d628b0040acad530550
+MD5 d4a4aa79b33aafc6d168a02abd603388 ChangeLog 1121
+RMD160 401f4a5aa4b11cc73ef84c26ff84c3927a06ffe1 ChangeLog 1121
+SHA256 7624a56d69a74f3da5b534e7d430587e0dfe58963e167d628b0040acad530550 ChangeLog 1121
 MISC metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 SHA1 af1f5473be400926e7bf9a98a354866150c8b7a7 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55
 MD5 a80bc50cf196a9e5a2764d6f6081b56a metadata.xml 247
 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 metadata.xml 247
 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55 metadata.xml 247
-MD5 7155461037d13c6fb6ca38ed2c747d76 files/digest-libmatchbox-1.7 250
-RMD160 58cb8fcf2727e7cead26eb85e1189ef514850e1b files/digest-libmatchbox-1.7 250
-SHA256 d8372a807b0a636b2e032818cca90bef5e9d2df68aa5709889afb8ee9316e81a files/digest-libmatchbox-1.7 250
 MD5 8a762cbefe3d91a7ebc53347681c8d4f files/digest-libmatchbox-1.8 250
 RMD160 db07f23f91d8796e0539f53ab505f63b1493a922 files/digest-libmatchbox-1.8 250
 SHA256 bdbebb8e7a5bfe62ee498d7937b1b1793d66c404fb1eb62b1092993931a4b462 files/digest-libmatchbox-1.8 250
+MD5 0c708e397516041453ac658331bdcfa8 files/digest-libmatchbox-1.9 250
+RMD160 337777744d63af302fc8c7d2117502bc4d23edee files/digest-libmatchbox-1.9 250
+SHA256 ef25fe1d00e052486629e28ffa3d49325a88a3e4851e84c0cb70eafb18027373 files/digest-libmatchbox-1.9 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE13E1yZl4piiTjjYRAk6MAJ4+fP4vadhP3ETRNclP8+2o5RIjIQCfT5rD
-dHOyha9g1xyICMEhf1Ye968=
-=oxBw
+iD8DBQFE5I+cyZl4piiTjjYRAvEDAKCWAanw1nuxVBW3wPWYF/RtnBZXmgCeMndY
+5x+IYjogy+/EZBT6VuSkVsM=
+=KWSI
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libmatchbox/files/digest-libmatchbox-1.7 b/x11-libs/libmatchbox/files/digest-libmatchbox-1.7
deleted file mode 100644
index 6df6c5ba2f4f..000000000000
--- a/x11-libs/libmatchbox/files/digest-libmatchbox-1.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 34bddbc6d18f7a99d4e9e9cf5f849885 libmatchbox-1.7.tar.bz2 250754
-RMD160 fa6bea1e2489fd3feae452103f6a2aa619454305 libmatchbox-1.7.tar.bz2 250754
-SHA256 f6e545e7e9bc35e1dd1b9a89ffd29d6cf1f2c975fc15ada4dbe0525871f6762e libmatchbox-1.7.tar.bz2 250754
diff --git a/x11-libs/libmatchbox/libmatchbox-1.7.ebuild b/x11-libs/libmatchbox/libmatchbox-1.7.ebuild
deleted file mode 100644
index 78ddcc9023cb..000000000000
--- a/x11-libs/libmatchbox/libmatchbox-1.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.7.ebuild,v 1.2 2006/07/14 17:20:21 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="~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/*
-}