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

(Portage version: 2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

3 files changed, 37 insertions, 10 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/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
 }