[gentoo-commits] dev/angelos:master commit in: x11-libs/bamf/

[Christoph Mende]

commit:     c34b09b64254de360c34e355941742e1179e9333
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 21 14:58:07 2011 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 14:58:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/angelos.git;a=commit;h=c34b09b6

bamf: Bump to 0.2.94 and split into gtk2/3 versions

(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key 84F20B43)

---
 x11-libs/bamf/Manifest                             |   15 +++++++------
 ...{bamf-0.2.92.ebuild => bamf-0.2.94-r200.ebuild} |   22 +++++++++++++++----
 ...{bamf-0.2.92.ebuild => bamf-0.2.94-r300.ebuild} |   21 ++++++++++++------
 x11-libs/bamf/metadata.xml                         |    3 ++
 4 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/x11-libs/bamf/Manifest b/x11-libs/bamf/Manifest
index a5017df..c07877d 100644
--- a/x11-libs/bamf/Manifest
+++ b/x11-libs/bamf/Manifest
@@ -1,13 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST bamf-0.2.92.tar.gz 484820 RMD160 2708f83fc3d11408d71a45d6e77d5ba7857e7156 SHA1 3959b3fa3cfa0e58236302ca935492f7024ea44c SHA256 a7385e464db68e5e494a2d5a9066d001a0b950266198ed3df940d7292e297bab
-EBUILD bamf-0.2.92.ebuild 643 RMD160 e91f854e3659fbec642b28400ebba54a6a873193 SHA1 9ee4f19feaed551236dfc7fe66c2f48550ae82f8 SHA256 29c087777e976828e4daf8c58d00add964f81f23cb85213310b968984a42b7d7
-MISC metadata.xml 162 RMD160 8056876fd0119a9fcf1cf8e6a622173f9a2a41a6 SHA1 54fe1b9e689c641de2d237db03c8c38c6f7b6522 SHA256 c754e9c767b98b9894c12dd21b8ef1d01f2b5e58813a286f9a62f20078888d85
+DIST bamf-0.2.94.tar.gz 502822 RMD160 4ea889717eed2f090b46c26b57f90d2b81cfbe09 SHA1 d859659b8426dbcc56b4e28be0f59bfe73acb37b SHA256 8865db734dbfaf59cb230c2c5464f5fea12c20f6220eaf411e90cb6d2c60df27
+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 265 RMD160 f18f259498fadf5a46f8d18c534214bc2a278aea SHA1 1623ceb8a6f81d1c1c03308d71f573befb5512dd SHA256 00136ab3c15bb2256ebe582cb2d695d4ffb46a5f409e29d7af2169c2136ab20b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4HKEoACgkQmWq1bYTyC0MkJQEAjLXQF4t4syAwHOiInTcuykeZ
-IxP6jEEc0TbgXZwhlrUA+wWgdNe30xFGwVW0kq9PF2cjrfGfKl8cCEGJDI9nlFw8
-=1Lwd
+iF4EAREIAAYFAk5RHP8ACgkQmWq1bYTyC0MN/QEAoNkPsMOQAH/1DBQwwa6qj7Rd
+2uh9e1Hen4YJZkkZljUBALp8WFbDDMX8hevNClKRvYLjcxys/+jNm/bHQT8wNCMZ
+=ZOhC
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/bamf/bamf-0.2.92.ebuild b/x11-libs/bamf/bamf-0.2.94-r200.ebuild
similarity index 64%
copy from x11-libs/bamf/bamf-0.2.92.ebuild
copy to x11-libs/bamf/bamf-0.2.94-r200.ebuild
index 7ffad5f..eba04d0 100644
--- a/x11-libs/bamf/bamf-0.2.92.ebuild
+++ b/x11-libs/bamf/bamf-0.2.94-r200.ebuild
@@ -9,25 +9,37 @@ 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"
+LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
 
 RDEPEND="dev-libs/dbus-glib
 	dev-libs/glib:2
 	gnome-base/libgtop:2
-	x11-libs/gtk+: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
+	econf \
+		--with-gtk=2 \
+		--disable-gtk-doc-html \
+		$(use_enable introspection)
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -exec rm {} + || die
 }

diff --git a/x11-libs/bamf/bamf-0.2.92.ebuild b/x11-libs/bamf/bamf-0.2.94-r300.ebuild
similarity index 68%
rename from x11-libs/bamf/bamf-0.2.92.ebuild
rename to x11-libs/bamf/bamf-0.2.94-r300.ebuild
index 7ffad5f..ef91cd6 100644
--- a/x11-libs/bamf/bamf-0.2.92.ebuild
+++ b/x11-libs/bamf/bamf-0.2.94-r300.ebuild
@@ -9,17 +9,17 @@ 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"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+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/gtk+:2
 	x11-libs/libX11
-	x11-libs/libwnck:1"
+	x11-libs/gtk+:3
+	x11-libs/libwnck:3"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -29,5 +29,12 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-gtk=2
+	econf \
+		--with-gtk=3 \
+		$(use_enable introspection)
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -exec rm {} + || die
 }

diff --git a/x11-libs/bamf/metadata.xml b/x11-libs/bamf/metadata.xml
index 1bb9c56..748c532 100644
--- a/x11-libs/bamf/metadata.xml
+++ b/x11-libs/bamf/metadata.xml
@@ -2,5 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>no-herd</herd>
+	<use>
+		<flag name="introspection">Install language bindings via gobject-introspection</flag>
+	</use>
 </pkgmetadata>