Keyword ~x86. Fix .desktop file validation. Missing sys-libs/db dependency wrt #432324 by Anthony Parsons.

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

3 files changed, 48 insertions, 41 deletions

diff --git a/mail-client/postler/ChangeLog b/mail-client/postler/ChangeLog
index e3faf34c3f4c..e44a0578dac7 100644
--- a/mail-client/postler/ChangeLog
+++ b/mail-client/postler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/postler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/postler/ChangeLog,v 1.6 2012/02/14 19:36:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/postler/ChangeLog,v 1.7 2012/10/21 11:49:49 ssuominen Exp $
+
+  21 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> postler-0.1.1.ebuild:
+  Keyword ~x86. Fix .desktop file validation. Missing sys-libs/db dependency
+  wrt #432324 by Anthony Parsons.
 
   14 Feb 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   ayatana is now global per http://archives.gentoo.org/gentoo-
diff --git a/mail-client/postler/Manifest b/mail-client/postler/Manifest
index fc88eebcaec3..2a802dbe93fa 100644
--- a/mail-client/postler/Manifest
+++ b/mail-client/postler/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST postler-0.1.1.tar.bz2 251521 RMD160 f5b3facdc8a16942a0ff1fb2e6bc1b7f8f17602e SHA1 f5c73c0219844d4092860eb4d8aa36223027b298 SHA256 2b40889161442a02863e992841253001901e25caf7e992d4f0f588966ea79223
-EBUILD postler-0.1.1.ebuild 1328 RMD160 3c1ed03c180881b802328770d9919a7e3b9afb94 SHA1 f0a33c3d75971cb9f44d8b5b83b8c46e37512480 SHA256 006054870d4decd7d04be2198e7086b98e745de90f986f519292861b88ddb595
-MISC ChangeLog 999 RMD160 06c8f647923e0141e7d4373fac01906e189a09f0 SHA1 c04f2d9a60e79a3532b8a9477a5cecb170edc9c9 SHA256 d719fc99fb51b811e4eeff8440b9c6cf00528513b607d6e834f9e6ffefb9ea74
-MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
+DIST postler-0.1.1.tar.bz2 251521 SHA256 2b40889161442a02863e992841253001901e25caf7e992d4f0f588966ea79223 SHA512 3e293f6da17c19f4906a3baba2b50ec4602fb34a56f8e8163b463b91114a24f2b6b4606b837a6bae6a91f772710187229aefd84500a2f57bacfd69a47db54b9f WHIRLPOOL be5df56012d848f8ad620fa008c8789a88726d3ab8e33b4ba7a97db8cfc18fbc8917d2ba659151d0dcb0d0e688a79431ba151b54957afa01975f6521d1b35013
+EBUILD postler-0.1.1.ebuild 1576 SHA256 29027c47b3d05f1f50d98faba7fb3a1e68e396238890a6fce2f3cabcba4fe446 SHA512 da365bc8e37026804d4e6f662f201282a2a359c7449193b2210b1ff0c460c7a4ed342eae1f8478cee36923b848936a45ca601efbad8a86c1bb74c49d01b28df7 WHIRLPOOL e7fdb4b7881a80e8d36ea1126a5aaa6b61d40f5097e86ca0843df00b43b03d2252b7eeaead53884176a65770a99e6b8123f4995dccdb02061627f74161e11285
+MISC ChangeLog 1188 SHA256 745b9729863e078f260701ea4be6764c956e7b62569df1a884824aed81064697 SHA512 c74b9109fe6236c5d0193e5064ef1afc444559fc727d8ffcb5a50ce158288f8488099c7741896ba6907c4fd8a658970e07c343ea641bdc760df190130fd7ded7 WHIRLPOOL e9449228673e18f13c434c4e727cdc6d6f839cb44151a0ec69e95533f383dc1cc45643c0ee393396d4e58e80a95885700b5baeaeee7ac71b44c5dbc9a37a3156
+MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPOrfXAAoJEPqDWhW0r/LCCfsP+gMZ9yaCRqsCNslI0xMGaj9H
-CmfyaUNlrpJFAbPSXEIUp9d8mhdiibnqD2e85J0Dw7vXU7C8eDcS8jYDw9NADnYP
-go9kmn15aScWOjRYA1SfsH2y6girbolhmpgXMOG/KZ1QfqaowxokkDMiEygEan3v
-YL95ljvyfXeZ4sDqRwuWWxC9d5KywltMYNIdB7dHdqnzTO1KUubUFTI9POzL370y
-WeUJdZh+fMc33tQoRDfgHXC5wAcZbw/eskTu15TY3eByCCz7s5wItKqtuSwHvtJU
-S8i18v3gMnNxPzlIQDEjnGIVUlHO95F1bn5hFrD8d2O3fU0HYTD7OPYRiBvX/5JC
-EU2R3P9LdiM52sS631daTxuKC2n4j+584E790ofl9cxOJxrVQs1dk0qVBbYVDHdh
-M3OoKUOT/keLCXd+3wpt4kHyDcFd7QVMxTodKDctXQehDmz6RfcRk1xrqMRL2r4I
-qN4UGYLNABXJcu4dfaQvrWPvydihlRCjgXXRjdLMDxI4zWoG57J6YXDPu+hwBvWq
-HgNN31GZ9TnpyqXWdVNVPdqXV+VNNQKZJ5LKEoOqCBScQ8VLpOsg8fTRhWaHAgmh
-xvPPAqhBYWreLvQdk4IHX55BZxCkvHR6dPLrS8mkgTrHmIPutYL3InaotK9UsEJX
-ocDljH2EerOf4htADt7s
-=huir
+iQEcBAEBCAAGBQJQg+B1AAoJEEdUh39IaPFNZfAH/AmUNSXpvwSHw7hj4vFK5V6j
+NeqbrzDKJQHeTgz/5akXcqKCVWCF2Ld3WyfZAOXuHpI6l5EAebZws2MOYVITS4ag
+299kjJNJkBW0S8yKiaZbR/X7L/SKGBMaZEZDEjXGTSdkoXezt58y4sETj4wYxH+/
+cHnwspZg4bq1XCxpdWLkZUdOWDqn4GKO9Z9XNbUWh3wBOc/w484Hq/sdf7aBKZmJ
+IqCsaZsMaJX8Qh0+cdnVWuUgRZSUhoWZt4fgdB1pGApqxwTBvOFHv5dOooRf6N94
+PnngSJ6CF0Js8uBzEUM0aX3Y2j9Lo/V5Vs52Hzgi8v6/qG47KH3+aS5ZLuuOH3E=
+=GfUk
 -----END PGP SIGNATURE-----
diff --git a/mail-client/postler/postler-0.1.1.ebuild b/mail-client/postler/postler-0.1.1.ebuild
index e99e34b5fa1c..9708189741a6 100644
--- a/mail-client/postler/postler-0.1.1.ebuild
+++ b/mail-client/postler/postler-0.1.1.ebuild
@@ -1,55 +1,64 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/postler/postler-0.1.1.ebuild,v 1.2 2011/03/21 21:58:55 nirbheek Exp $
-
-EAPI=3
+# $Header: /var/cvsroot/gentoo-x86/mail-client/postler/postler-0.1.1.ebuild,v 1.3 2012/10/21 11:49:49 ssuominen Exp $
 
+EAPI=4
 inherit gnome2-utils python waf-utils
 
+POSTLER_VALA_VERSION=0.10
+
 DESCRIPTION="A super sexy, ultra simple desktop mail client built in vala"
-HOMEPAGE="https://launchpad.net/postler"
-SRC_URI="http://git.xfce.org/apps/${PN}/snapshot/${P}.tar.bz2"
+HOMEPAGE="http://launchpad.net/postler"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ayatana"
+KEYWORDS="~amd64 ~x86"
+IUSE="" # ayatana, disabled because we only support GTK+-3.x with ayatana libs in purpose
 
-RDEPEND=">=dev-libs/glib-2.26:2
+RDEPEND=">=dev-libs/glib-2.26
 	dev-libs/libunique:1
-	dev-libs/openssl
+	dev-libs/openssl:0
 	mail-mta/msmtp
 	media-libs/libcanberra
 	net-libs/webkit-gtk:2
+	sys-libs/db
 	>=x11-libs/gtk+-2.18:2
-	x11-libs/libnotify
-	ayatana? ( dev-libs/libindicate )"
+	>=x11-libs/libnotify-0.7"
+# ayatana? ( dev-libs/libindicate )"
 DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.6 dev-lang/python:2.7 )
-	dev-lang/vala:0.10
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	dev-lang/vala:${POSTLER_VALA_VERSION}
 	dev-util/intltool
 	sys-devel/gettext"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:Categories=.*:&Office;:' data/${PN}.desktop.in || die
+	base_src_prepare
 }
 
 src_configure() {
-	VALAC="$(type -p valac-0.10)" \
+	VALAC="$(type -P valac-${POSTLER_VALA_VERSION})" \
 		   waf-utils_src_configure \
 		   --disable-docs \
-		   $(use_enable ayatana libindicate)
+		   --disable-libindicate
+# $(use_enable ayatana libindicate)
 }
 
 src_install() {
 	waf-utils_src_install
-	dodoc ChangeLog README || die "dodoc failed"
+	dodoc ChangeLog README
 }
 
 src_test() {
-	"${WAF_BINARY}" check || die "check failed"
+	"${WAF_BINARY}" check || die
 }
 
-pkg_preinst() { gnome2_icon_savelist ; }
-pkg_postinst() { gnome2_icon_cache_update ; }
-pkg_postrm() { gnome2_icon_cache_update ; }
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }