fix QA warnings. Fix various ebuild issues in 1.1. Add gettext and pkg-config in DEPEND per bug #233070.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 50 insertions, 13 deletions

diff --git a/net-misc/blogtk/ChangeLog b/net-misc/blogtk/ChangeLog
index 790bf4cb6253..77b0b1a9148f 100644
--- a/net-misc/blogtk/ChangeLog
+++ b/net-misc/blogtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/blogtk
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/ChangeLog,v 1.14 2007/07/02 14:59:23 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/ChangeLog,v 1.15 2008/07/26 22:48:58 eva Exp $
+
+  26 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org> ChangeLog:
+  fix QA warnings. Fix various ebuild issues in 1.1. Add gettext and
+  pkg-config in DEPEND per bug #233070.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> blogtk-1.0.ebuild,
   blogtk-1.1.ebuild:
diff --git a/net-misc/blogtk/Manifest b/net-misc/blogtk/Manifest
index 921c7c465817..fc3dc773c815 100644
--- a/net-misc/blogtk/Manifest
+++ b/net-misc/blogtk/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX blogtk-1.0-destdir.patch 1029 RMD160 b27490b047b7c0a24b14098490cab90170ec8acf SHA1 689b3feb80e0aa357ea1da2790c1c998ec66db1a SHA256 d2ef0298f6cc0d5b0d33324486ee223cf40537492198fb9de5c8d5a3f568800e
 AUX blogtk-1.1-destdir.patch 1163 RMD160 c0a15007c0bb6d157e4d35aa92278e9ac60c3b32 SHA1 31da00d26de3840aabd0c12c61e88f84db76338f SHA256 2f605494fa69aec83df65df12a5379b45c701b5115ed6359cd3fc95d937eb6e1
 DIST BloGTK-1.1.tar.bz2 64325 RMD160 4ad92fc8f19106b89288d0a78431facb66316838 SHA1 f0736685f646b22a6302013ea384770bcab4cac7 SHA256 de12ee193f14e10f4d9a81804adb242316f42a27bc4c2bd11470b4b6c830eeab
 DIST blogtk_1.0.tar.bz2 52265 RMD160 fad7606d353adbbce0cf75692d7af77b49d158ad SHA1 0b7a7f3b02ccf0d0a109bc40a1d3ae9c86ed59f8 SHA256 350aaa54bba84953a084ed75f53fdf5769c24f2e6ba4945ca440ceab36448c5a
-EBUILD blogtk-1.0.ebuild 813 RMD160 f8d9135295f84f9503e4d2e206949c7e5a3cfbf3 SHA1 ba258c2aef7690662ed00e348b8da08c0804198a SHA256 5224f75610263d92032a8676f2d34922608a36fb155511f6089195454f091750
-EBUILD blogtk-1.1.ebuild 904 RMD160 6dd5e6c4fcb062b2819cacae8d4790c43d610eb3 SHA1 211dacb8dd5f1e578e5eab9ab618d01749158d59 SHA256 783707dee94536cd934c93d31d50ae0b59edb26cead6d69602689807a6ad54e5
-MISC ChangeLog 2216 RMD160 3f3db113d3c21325f7a9fcaac530b134dd720cdf SHA1 c146d875505986a788e4fed5a187cf121647da43 SHA256 1c34cf1ab0c38071c0efda829a06caff2373ed3722ecc19fb94aa54e7e76df9e
+EBUILD blogtk-1.0.ebuild 877 RMD160 49b34db4e0e5fe4048828fa877680ec22ece2959 SHA1 2261f5121f0380e9a384bf4410d04eabec2bee27 SHA256 7e6f033bcd382bd08280a81d2958f1459eafe878141e249b8e4ae47d1dcf5cbe
+EBUILD blogtk-1.1.ebuild 1275 RMD160 5a2ff8d456cf93a57c33ca8a5805f80e50a15558 SHA1 93726a21c596b14fb195ad514a6b36697093353c SHA256 891fe9f6efb00d0895c5653cc4b260720c43c429ee7a141a3023ed79baa4666c
+MISC ChangeLog 2389 RMD160 8f5f83a202bf5adf155e7e694ecfe1cb55f6c4d3 SHA1 c39b1cfe81c7b8d94e0c7dc60fdede16da5752f3 SHA256 18ec118e3f5a2b6597d2e2bd80827485f22c4e91a888ae25dfcc41f063c85357
 MISC metadata.xml 220 RMD160 189ec4e34d1f0af3a68f1c5c8d62b6a43efa5d04 SHA1 2de8ad8c1f3b39c0d4da9cf7ff8d29cc326035f7 SHA256 77201144984d46bed7f03b0cfe632236c176d645cb04566c7954a6218b968f98
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiLqeMACgkQ1fmVwcYIWAbxLACg3RVxPW8F2raKb7UzAioYHl0/
+Iw0An2ruM2FsWmHfpW5vSCLi14MEof5T
+=nMUX
+-----END PGP SIGNATURE-----
diff --git a/net-misc/blogtk/blogtk-1.0.ebuild b/net-misc/blogtk/blogtk-1.0.ebuild
index e31d68d9022f..b11134f33d3e 100644
--- a/net-misc/blogtk/blogtk-1.0.ebuild
+++ b/net-misc/blogtk/blogtk-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/blogtk-1.0.ebuild,v 1.5 2007/07/02 14:59:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/blogtk-1.0.ebuild,v 1.6 2008/07/26 22:48:58 eva Exp $
 
 inherit eutils
 
@@ -18,12 +18,17 @@ IUSE=""
 RDEPEND=">=dev-python/pygtk-2.0.0
 	>=gnome-base/gconf-2.2.0
 	>=dev-python/gnome-python-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/${P}-destdir.patch
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-destdir.patch"
 }
 
 src_compile() {
@@ -31,5 +36,5 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "Unable to compile blogtk"
+	make DESTDIR="${D}" install || die "Unable to compile blogtk"
 }
diff --git a/net-misc/blogtk/blogtk-1.1.ebuild b/net-misc/blogtk/blogtk-1.1.ebuild
index 46ec65df64b1..b3b4fa022892 100644
--- a/net-misc/blogtk/blogtk-1.1.ebuild
+++ b/net-misc/blogtk/blogtk-1.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/blogtk-1.1.ebuild,v 1.5 2007/07/02 14:59:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/blogtk/blogtk-1.1.ebuild,v 1.6 2008/07/26 22:48:58 eva Exp $
 
-inherit eutils
+inherit eutils fdo-mime python
 
 DESCRIPTION="GTK Blog - post entries to your blog"
 HOMEPAGE="http://blogtk.sourceforge.net"
@@ -12,7 +12,7 @@ S="${WORKDIR}/BloGTK-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pygtk-2.0.0
@@ -20,12 +20,20 @@ RDEPEND=">=dev-python/pygtk-2.0.0
 	>=dev-python/gnome-python-2
 	dev-python/gnome-python-extras
 	amd64? ( >=dev-python/gnome-python-2.6.1 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.1-destdir.patch
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-destdir.patch"
+
+	# Respect multilib
+	sed -i "s:lib/blogtk:$(get_libdir)/blogtk:g" Makefile || die "sed failed"
 }
 
 src_compile() {
@@ -33,5 +41,15 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "Unable to compile blogtk"
+	emake DESTDIR="${D}" install || die "Unable to compile blogtk"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	python_mod_optimize /usr/$(get_libdir)/blogtk
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	python_mod_cleanup /usr/$(get_libdir)/blogtk
 }