Fix building with x11-libs/libnotify >= 0.7. Remove useless .la files.

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

4 files changed, 65 insertions, 41 deletions

diff --git a/app-office/rubrica/ChangeLog b/app-office/rubrica/ChangeLog
index b2ecc976be23..8e791fa99f84 100644
--- a/app-office/rubrica/ChangeLog
+++ b/app-office/rubrica/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/rubrica
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/ChangeLog,v 1.14 2010/12/17 16:27:20 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/ChangeLog,v 1.15 2011/01/30 18:24:48 ssuominen Exp $
+
+  30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> rubrica-2.1.6-r1.ebuild,
+  +files/rubrica-2.1.6-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7. Remove useless .la files.
 
   17 Dec 2010; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
   Drop maintainership
diff --git a/app-office/rubrica/Manifest b/app-office/rubrica/Manifest
index 4e6f927035b4..d29e2a8c4b1f 100644
--- a/app-office/rubrica/Manifest
+++ b/app-office/rubrica/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX rubrica-2.1.6-libnotify-0.7.patch 799 RMD160 63820a89103c353b04532e137285987b526196fd SHA1 453817ab55701e683f6787573210d540904988fa SHA256 20262f02c4321863a90d8af97522bcb52290b91ee2b85dca6ae8de6526993b5b
 AUX rubrica-2.1.6_fix-menu-language.patch 18304 RMD160 18b03ef0b4f55064ddf9791535fee8d6b3b10f79 SHA1 804d608ee6df112ac4e4ddf023b9103a658a3a94 SHA256 1ed1b12c7b830cf81858e211ed0136baa069bf7f2e92c1ef109fc4a40535334a
 AUX rubrica-2.1.6_missing-icons.patch 1412 RMD160 3e5c6735e84d80a503d8711eefc7534ca45dd760 SHA1 6d97288a1d9b087baea0bbc475f914545ee979e3 SHA256 28f76998c4ecba14b344559b9c2156297abd8d2c56a40ac66ff660dc15827d52
 AUX rubrica-2.1.6_url-crash.patch 1464 RMD160 ea2e0569eadf589cdb3438682ed5293d9a2c50de SHA1 d4a9dd488b59e4b2c40828bdd56dafb99b07682f SHA256 abcc60a8b80f45ff1019b35a5ea2f80c7038b1b616622b29105656b044f7cd63
@@ -9,13 +7,6 @@ DIST rubrica-2.1.6-hu.po.bz2 9213 RMD160 be0db5c3506d988a463dab6def25b2ce5db47fb
 DIST rubrica2-2.0.2.tar.bz2 684277 RMD160 38ee4eed9bae99114840a400d9ce515bcc6ddbdf SHA1 d9a3fd8a22ee9db7d69ea9ca61fb1ee6574eb13b SHA256 546ef3e5828e3f4fabe1e4b7294374e8a580e60824dd02257f6026a3ac36eef2
 DIST rubrica2-2.1.6.tar.bz2 710715 RMD160 fedf6cf5236acf337e7cb9f8bfd2916bb2fad66f SHA1 e117b42c43e8ae5fc3e54babb6994adc913504b5 SHA256 4d9462243af4741e3571c9283f5a29ceb85a19c3dc1192148983c235a212dc9d
 EBUILD rubrica-2.0.2.ebuild 655 RMD160 37ae74de045787b406f37e31e7f6eab397c4c95f SHA1 ab90d1fb7f2de2eaf6fe63f18540c55fd9fd1001 SHA256 e929e6f70841e6786c159a0223e43397bb15ed94b0c43aa18dd33ee510aa49d3
-EBUILD rubrica-2.1.6-r1.ebuild 1415 RMD160 025341fcb179799db457dc9fa239c7f1426f07e7 SHA1 715d9ae8c61661d0046383064a19165243644c92 SHA256 7f059a8c7e4957555a015463b26e39136fc7dad9d4ba98ced9659945d0ed10b8
-MISC ChangeLog 2468 RMD160 ac8412e6b5bf850d677e30aaa0cdf51312ab4a80 SHA1 04087715cc80180fef195fbe018e69763d3d6ab6 SHA256 5c6bd1e1253d6f0f50e1a138788d097e7cc7295ee44c264aa399c0c458f99733
+EBUILD rubrica-2.1.6-r1.ebuild 1632 RMD160 76bcbff95271ee7fada07ee0fa2c9af9061e042d SHA1 f84728019e88b44f3ec4f365588cea5a0082e5c6 SHA256 d136891c269bb1494871d9dee572d6cab44274b066c8c15ff04348f0f7913958
+MISC ChangeLog 2669 RMD160 99ee02def1a59c225049be88225560954219a3e0 SHA1 c9ff9e28f3824a51083df3b061d9e3a0e2016918 SHA256 09b395954fb5fefb879aa17014aed999ff2babf93b09d6bfb0a2446a952d4b51
 MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0LkAgACgkQNQqtfCuFneOKwgCfbAotZAW7ldzenQSKGArt7+R/
-q5YAoJJkWuy9HEKct0G1kLTWgL2X/4qX
-=4Htj
------END PGP SIGNATURE-----
diff --git a/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch b/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch
new file mode 100644
index 000000000000..9ab854aff20a
--- /dev/null
+++ b/app-office/rubrica/files/rubrica-2.1.6-libnotify-0.7.patch
@@ -0,0 +1,20 @@
+--- src/app.c
++++ src/app.c
+@@ -1338,8 +1338,15 @@
+   self->priv->statusbar      = rubrica_statusbar_new();
+   
+   self->priv->cutted         = NULL;
+-  self->priv->notify         = notify_notification_new("Rubrica Addressbook",
+-						      NULL, "info", NULL);
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  self->priv->notify         = notify_notification_new("Rubrica Addressbook", NULL, "info");
++#else
++  self->priv->notify         = notify_notification_new("Rubrica Addressbook", NULL, "info", NULL);
++#endif
++#else
++  self->priv->notify         = notify_notification_new("Rubrica Addressbook", NULL, "info", NULL);
++#endif
+   self->priv->active_plugin  = g_strdup("autodetect");
+   self->priv->manager        = r_lib_get_manager();
+   self->priv->print_settings = NULL;
diff --git a/app-office/rubrica/rubrica-2.1.6-r1.ebuild b/app-office/rubrica/rubrica-2.1.6-r1.ebuild
index 25cf21438b02..9ddfcf9e134e 100644
--- a/app-office/rubrica/rubrica-2.1.6-r1.ebuild
+++ b/app-office/rubrica/rubrica-2.1.6-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v 1.4 2009/06/20 23:22:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v 1.5 2011/01/30 18:24:48 ssuominen Exp $
 
-EAPI=1
-
-inherit gnome2 eutils
+EAPI=2
+inherit eutils gnome2
 
 MY_PN=${PN}2
 
@@ -13,34 +12,41 @@ HOMEPAGE="http://rubrica.berlios.de/"
 SRC_URI="mirror://berlios/${PN}/${MY_PN}-${PV}.tar.bz2
 	linguas_hu? ( mirror://gentoo/${P}-hu.po.bz2 )"
 
-IUSE="linguas_hu"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86"
-LICENSE="GPL-3"
-
-DOCS="AUTHORS ChangeLog CREDITS INSTALL NEWS README TODO"
-S=${WORKDIR}/${MY_PN}-${PV}/
+IUSE="linguas_hu"
 
-RDEPEND="dev-libs/libxml2
-	gnome-base/libglade
+RDEPEND="dev-libs/glib:2
+	dev-libs/libxml2
+	>=gnome-base/libglade-2
 	gnome-base/gconf:2
-	dev-perl/XML-Parser
-	x11-libs/libnotify
-	linguas_hu?	( >=sys-devel/gettext-0.16.1 )"
-
+	x11-libs/gtk+:2
+	x11-libs/libnotify"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/intltool
+	dev-util/pkgconfig
+	linguas_hu? ( >=sys-devel/gettext-0.16.1 )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		--disable-static
+		--with-html-dir=/usr/share/doc/${PF}/html"
 
-src_unpack() {
-	gnome2_src_unpack
-	cd "${S}"
+	DOCS="AUTHORS ChangeLog CREDITS NEWS README TODO"
+}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
 	# False menu in locales
-	epatch "${FILESDIR}/${P}_fix-menu-language.patch"
+	epatch "${FILESDIR}"/${P}_fix-menu-language.patch
 	# Missing gnome icons
-	epatch "${FILESDIR}/${P}_missing-icons.patch"
-	cd "${S}/po"
-	epatch "${FILESDIR}/${P}_url-crash.patch"
+	epatch "${FILESDIR}"/${P}_missing-icons.patch
+	cd po
+	epatch "${FILESDIR}"/${P}_url-crash.patch
 }
 
 src_compile() {
@@ -48,16 +54,19 @@ src_compile() {
 
 	# Add Hungarian translation
 	if use linguas_hu; then
-		msgfmt "${WORKDIR}/${P}-hu.po" --output-file "po/hu.gmo" || die
+		msgfmt "${WORKDIR}"/${P}-hu.po --output-file po/hu.gmo || die
 	fi
 }
 
 src_install() {
 	gnome2_src_install
 
-	domenu "${FILESDIR}/${MY_PN}.desktop"
+	domenu "${FILESDIR}"/${MY_PN}.desktop
+
 	if use linguas_hu; then
 		domo po/hu.gmo || die
-		dosym "${PN}.mo" "/usr/share/locale/hu/LC_MESSAGES/${MY_PN}.mo"
+		dosym ${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${MY_PN}.mo || die
 	fi
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
 }