5 files changed, 10 insertions, 108 deletions
diff --git a/x11-libs/bamf/Manifest b/x11-libs/bamf/Manifest
index aa01bf4..b56a9c2 100644
--- a/x11-libs/bamf/Manifest
+++ b/x11-libs/bamf/Manifest
@@ -1,17 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST bamf-0.2.104.tar.gz 508806 RMD160 094fb95d2914fa4ff61d93d98ea6ead03078a81e SHA1 54b54506c2e9516d6ea16d7fddef6eee91b4028d SHA256 7903fb941dbdcab956ccb67da7845ea2dd4f39634e789f769cfdddf5fd71bee8
-DIST bamf-0.2.94.tar.gz 502822 RMD160 4ea889717eed2f090b46c26b57f90d2b81cfbe09 SHA1 d859659b8426dbcc56b4e28be0f59bfe73acb37b SHA256 8865db734dbfaf59cb230c2c5464f5fea12c20f6220eaf411e90cb6d2c60df27
-EBUILD bamf-0.2.104-r200.ebuild 895 RMD160 f5c2c8085c9bfca957e86822c59d1d44415b9a71 SHA1 a334b38f180daa70bd81149f7aecaa3dccc1c1b7 SHA256 9206dda21b1f9117f159ea79001f33067f775e15579e4cdb2c001815f91d3a00
-EBUILD bamf-0.2.104-r300.ebuild 773 RMD160 d399f1e29429b9b84a6d0ead20e6164c6bfc5eec SHA1 697e2bbc41a245d0b0e2c441059f1828f51ca496 SHA256 95c9b4132fc0ef737bc3afc4c5b5f0c323eb4f3d14f92ce2d980f4315d7e85f9
-EBUILD bamf-0.2.94-r200.ebuild 895 RMD160 f5c2c8085c9bfca957e86822c59d1d44415b9a71 SHA1 a334b38f180daa70bd81149f7aecaa3dccc1c1b7 SHA256 9206dda21b1f9117f159ea79001f33067f775e15579e4cdb2c001815f91d3a00
-EBUILD bamf-0.2.94-r300.ebuild 781 RMD160 083b4042a4036d9388b968ceaddbaf2d1d4ea2be SHA1 889a72490952d4b0910bc7ec548202ec4baf7a75 SHA256 d7d2aa9d3864e066f78ba7005558697624afead8a074222ccf6bfa1360a56628
-MISC metadata.xml 243 RMD160 1efcec874bfdf411ae15e1515b3ad646f3f6111e SHA1 93fe6989849d60b283a771c5e8b1e17dbf017df4 SHA256 f1477392038dae98bef8ecbcc94440cb6d14ca0e3193869de403b312e1a55fa6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk7t8iQACgkQmWq1bYTyC0NkRQEAgSvXawNY3/mkqcfgx4opZsrI
-M4l/OoYXwmvyKIB0n/gA/3RTNfd71WGfoJ1v8iYx6Gb928S1JblGd4ORXmMp5tZ5
-=QOeO
------END PGP SIGNATURE-----
+DIST bamf-0.2.120.tar.gz 597910 SHA256 6b9b809dda185cfebff2ad354a71e8927ba541cd49a8adef6220721a93870908 SHA512 397cd5f75c3bd75a0795fe4ca39e56916aea1c3a54967e8f68efca06afb8a511aae883152215ff91e1d6bd6d539cf923540ec139070fd8b8f9e5dbc5cdcc5233 WHIRLPOOL 17784477347303e4bc34e142795d236d5c3628f8ed8d0f3daf0974599dd358a2e55679c6af80cc7561ce1e20e8bbefa6b5898cd3601185fc2b90130a0932c49c
+EBUILD bamf-0.2.120-r200.ebuild 901 SHA256 85d171c9fcc8210447e93f6e9280331e7fa5b807d1fa25c6bc167f7bfe958ebd SHA512 2baedfe835a9ad9676223f8d60c0cd93ef4ab88955a8835be5eabce4c9313c2534c36db4763923b2d551fdf03c9c2e8c81cc59bf0f299cc68270486e1dde0d46 WHIRLPOOL d38c00c0f5e950fc92013cf38b5276b7663e23851a0a9c5677860f7c1fcfff65af74f3b5f2429da8e4598b4580930208598b8d285fab688b142bc3a1a07bab7f
+EBUILD bamf-0.2.120-r300.ebuild 787 SHA256 596669a73bdd9ba0685e05c8caeea36eb8a4b41fa011642b951856976c6b0074 SHA512 b3b2aaf57fd8a96ea225f1ae67edc207bd7330b91565c134ac4e26fa6ec623cfb642c5512ac21be05b003d26773a5190157b42121b018589eba0eadc0b5cc37a WHIRLPOOL b9ffbe7750a98fedbb5e5fc6a88e678130e296720e370a7a7bfcac759ccc91a4de1e1396ba59154a3d606a2df241fc18d3df8efd93d7997258a7b859b99e5376
+MISC metadata.xml 243 SHA256 f1477392038dae98bef8ecbcc94440cb6d14ca0e3193869de403b312e1a55fa6 SHA512 f26be19da34e5c12b397520853114ce3cc38ed8dd3c9fad29305046106d5b54383057e9f6c7e921b6ec815fe53bc402072952f502d7fdaea3adf3ea7e4802c56 WHIRLPOOL 5f46b03fd0b738168607e0acbc5158b9c5dd9377e010043c2516fa483a6dfbd200995844090f813341f0865a7d1d3a78c49d90051d36971118213d7dcef03555
diff --git a/x11-libs/bamf/bamf-0.2.104-r300.ebuild b/x11-libs/bamf/bamf-0.2.104-r300.ebuild
deleted file mode 100644
index 02b1273..0000000
--- a/x11-libs/bamf/bamf-0.2.104-r300.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit autotools
-
-DESCRIPTION="BAMF Application Matching Framework"
-HOMEPAGE="https://launchpad.net/bamf"
-SRC_URI="http://launchpad.net/${PN}/0.2/204/+download/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
-
-RDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
-	gnome-base/libgtop:2
-	x11-libs/libX11
-	x11-libs/gtk+:3
-	x11-libs/libwnck:3"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	sed -i -e "s:-Wall -Werror::" configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-gtk=3 \
-		$(use_enable introspection)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/x11-libs/bamf/bamf-0.2.104-r200.ebuild b/x11-libs/bamf/bamf-0.2.120-r200.ebuild
index eba04d0..df9048c 100644
--- a/x11-libs/bamf/bamf-0.2.104-r200.ebuild
+++ b/x11-libs/bamf/bamf-0.2.120-r200.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,13 +15,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+introspection"
 
 RDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
+	>=dev-libs/glib-2.28:2
 	gnome-base/libgtop:2
 	x11-libs/libX11
 	x11-libs/gtk+:2
 	x11-libs/libwnck:1"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 src_prepare() {
 	sed -i -e "s:-Wall -Werror::" configure.in || die
diff --git a/x11-libs/bamf/bamf-0.2.94-r300.ebuild b/x11-libs/bamf/bamf-0.2.120-r300.ebuild
index ef91cd6..f78bd21 100644
--- a/x11-libs/bamf/bamf-0.2.94-r300.ebuild
+++ b/x11-libs/bamf/bamf-0.2.120-r300.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,13 +15,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+introspection"
 
 RDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
+	>=dev-libs/glib-2.28:2
 	gnome-base/libgtop:2
 	x11-libs/libX11
 	x11-libs/gtk+:3
 	x11-libs/libwnck:3"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 src_prepare() {
 	sed -i -e "s:-Wall -Werror::" configure.in || die
diff --git a/x11-libs/bamf/bamf-0.2.94-r200.ebuild b/x11-libs/bamf/bamf-0.2.94-r200.ebuild
deleted file mode 100644
index eba04d0..0000000
--- a/x11-libs/bamf/bamf-0.2.94-r200.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit autotools
-
-DESCRIPTION="BAMF Application Matching Framework"
-HOMEPAGE="https://launchpad.net/bamf"
-SRC_URI="http://launchpad.net/${PN}/0.2/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
-
-RDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
-	gnome-base/libgtop:2
-	x11-libs/libX11
-	x11-libs/gtk+:2
-	x11-libs/libwnck:1"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	sed -i -e "s:-Wall -Werror::" configure.in || die
-	sed -e "/src/d" \
-		-e "/data/d" \
-		-e "s: doc: \$(NULL):" \
-		-i Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-gtk=2 \
-		--disable-gtk-doc-html \
-		$(use_enable introspection)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -exec rm {} + || die
-}