Fix underlinking wrt #468522 by Ted Tanberry. Pull gnome-base/gnome-common for eautoreconf. Fix ebuild coding style, like deprecated G2CONF.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 53 insertions, 21 deletions

diff --git a/x11-misc/notification-daemon/ChangeLog b/x11-misc/notification-daemon/ChangeLog
index 44a923e5a139..7b03cacfc9f8 100644
--- a/x11-misc/notification-daemon/ChangeLog
+++ b/x11-misc/notification-daemon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/notification-daemon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.96 2014/02/22 22:57:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.97 2014/06/02 17:56:49 ssuominen Exp $
+
+  02 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/notification-daemon-0.5.0-underlinking.patch,
+  notification-daemon-0.5.0.ebuild:
+  Fix underlinking wrt #468522 by Ted Tanberry. Pull gnome-base/gnome-common for
+  eautoreconf. Fix ebuild coding style, like deprecated G2CONF.
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> notification-daemon-0.7.6.ebuild:
   Fix wrong commit, bug 502160
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 5f8070d7126c..264c00089e4b 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -2,16 +2,21 @@
 Hash: SHA256
 
 AUX notification-daemon-0.5.0-libnotify-0.7.patch 948 SHA256 b946ffadaebac45d845618853d73afbae68636de0c791b7f962fc46413b59e30 SHA512 e828d89197c29c3b8e2b6b2e616d6fd63952f8b8ac23f4a0b7a8f6a75722e011d1684302b711ee530506e4e17aae6c7949f12f58a113ca6bb254a29d146d5870 WHIRLPOOL 5a7e1c714bc4c7ea091f6647c9274f63a480a7c3265cbb1966aa114e503e1190b242f69f9133a05d8f15bd6851af6365074192009747048b4916015801dcadba
-DIST notification-daemon-0.5.0.tar.bz2 330034 SHA256 aa1d3546fd1d5c51087317f4921c419927b644c12c39b557c959c9b45deb1475
+AUX notification-daemon-0.5.0-underlinking.patch 277 SHA256 854775d0d7db1e42240faeb6a7010c29a589335f0ce4df7b44a95a126dccac9c SHA512 e370ed9435b474fddf0b884d6781bdbfb1cb68dd7f851e72f525d6153235d39f77d28257c6d720f3de63df8ac29a7bf9100669813f4edda177a9dbf21afa3e5e WHIRLPOOL ae077cb806194c314533337a683c8d07f9b6f2dd5ebf7d68a7e0c205e0c37fac0f9f6d3b6aed87db7e293da664ceecb95ffde03485fc1705ccf1fdec01632ad5
+DIST notification-daemon-0.5.0.tar.bz2 330034 SHA256 aa1d3546fd1d5c51087317f4921c419927b644c12c39b557c959c9b45deb1475 SHA512 abdc86732afebbbe819db779924b82642fee7d29c005564dc890918849e2af11dbff5ba36e1d089c35318236e5950ac69df7e379fc48e7d696d27facce203b5a WHIRLPOOL e49419b4d09b3e4cd0baf0887c628f7d16edefad62de8e73939d7df948a8c24ddbae66c9ac6da9c9eba94b4783e07aafdfcc92de37fed231c44900afac4d564a
 DIST notification-daemon-0.7.6.tar.xz 279488 SHA256 64d0ce6fb12c94c3b73b701502c804c408cb5a94580bcae5ac37607639f7a0b3 SHA512 b781eef6b0a0208726c669083f024047651e2cf4ab79275076b6c36d2c6b551349a085618828bf4d8c013367be3c88c660d3231c8a6c6ce37cb6c6b0e436ed44 WHIRLPOOL 7f8e1ab298df8e945511eb438afae0943cc9da193c6a5cd0c36ed0a0bcf15c5553e8ff1b918c9a3c23cc534ff747a8a2e370e48a46f408b39abbdb0a1af85897
-EBUILD notification-daemon-0.5.0.ebuild 1090 SHA256 19804db10c796e3c60668a4efe42a8384a263de10206885f91393ecb03c3e98f SHA512 f5e67079982da7d7839490a1a7a8cb998630304da66b0934f6c8c29891e9af4808008e3da4c82d85ea3d0e3f74df79d528d082f0ecae7f98e6b9b1335623c57d WHIRLPOOL 514b7ef3c104be60d1bec31ab8d8a8b4aed6c8950196bb1f98bbc7d8b5c359f71abc3218417f1f50d35a23577153e61d56c7c727ce694e88e620a2bf45831946
+EBUILD notification-daemon-0.5.0.ebuild 1229 SHA256 39588a7bb3672ecb4874221a5a4a11af35c6bf8e3855c8c00693827cf5a706cc SHA512 b25c223ca5dcc41d04cacc9e890c46c5742ca53f325119ce953f42f617af5a42511a094fff2d502c4dbdf7eb83507b97c4999ab8f31ee5cfbc337095dd18317e WHIRLPOOL 3a74a5d311a9429df40dc2ccab8c89bcd5c56f6c9835d55b3fb4d1fd7d40d7267534745a1f802b594e14137b39990bd2c5e0671d7e9f260ccfa7b012effe2ad0
 EBUILD notification-daemon-0.7.6.ebuild 1165 SHA256 8ac84320adf52c70553fbb95ab8e97fb41899416e5c2ad1e1417463b0f1da7ee SHA512 82d67b0d1ea437a4d605ac1c40f162c8c25a9334637756298189a7807ffd9c10c8d705d29c25d987c9f7c2d7720c8f4f590254b46fd405194c88f46fd7ea84ae WHIRLPOOL 9a482a7c4958d31e3c82bf4a9dc2691e2986f084c8e5c8fba2bfc3dd7410c33339f8e0674d90a017a03961b696c72596372a3d48150b275cbcd4e2c8dfb8f087
-MISC ChangeLog 14235 SHA256 f83feec362324a0c228d6fb1bf8f519fd8ede3dc3d5cf3c3c77d92a6a9170898 SHA512 d303c1b2c4497ec9fe802306b616fe78d4c62be380576795ff585a4ecd1f0a022a666236d0e85af1ae510e3b6b5406a2c7bb2a13bb505a8fafe0c6b6feec394e WHIRLPOOL 29ba917fcd239d56ec6eac432a47f206764a5ab14d47c6158d3e497159203a3c9656f19f0eff6dc1fa6f2e0225107e6146da2cd6d106fae8c6cb28d7733c9abf
+MISC ChangeLog 14530 SHA256 0603989dc1079bc64bd46bffff7d5799866e8ab96a951f698848896684ceffac SHA512 05994f839434a8a24d1cce770de8558bf9f290bedb111ee2bf70f7616a87b6d9de28ee9b4f7ef196aba264a4a081a97e8f6adb579fb9e79f71fbc3d64698a8ef WHIRLPOOL c88ab6869869572d178e0496d7021a7b41f00155597004b9262df1079a98d8a7228e962d2ec23dc1db978083e126b19e4eaf772f2675470a243bc30a669f72d3
 MISC metadata.xml 165 SHA256 dc2ad50713441100082e32ba283e9dd807b8fc46f69a5b9221fb9b89064deb31 SHA512 c7beeaecf6465a53131311cd32bf7ec1ab7dd9d967b283383d2861c504a7d5f19451699a4487c3cb10ddd61fb54454965dc9ab32f893c7046c52ce1db8d5051b WHIRLPOOL 02982522dbae8a221de9a511b7c5d8f7c59d564d2b991650953707e2799ad4bcf8885589a529d0395756212cea637dbf2122f85db2131f61a760c3702ee1535b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMJK1YACgkQCaWpQKGI+9RwNACePdL+nvDVESCxzJo41NvI8KCI
-m+IAn0WkyJghhZJr3ncIFECUPil+bakP
-=rlTq
+iQEcBAEBCAAGBQJTjLpdAAoJEEdUh39IaPFNiEIH/RCBdXw8TSvFD5m1M0PLEsRx
+RheKtdbirCji5xtsMQ40entuigoDpmis0AMoBViFx8AotV+NMK/4s15ZIeWurn+2
+DJkeu4rBXb3ql0ZvR6SNpOVFgpepbRa402aEE734jCTb1csZzP+kA5x5khIpAZKs
+IMkAy8C+9wWe5Vpt3BlxiAZ/kth/AQdHT6Vd2gywklO+zltuyIaanvczZUIfqdpE
+SO+WVrzivp60qIydEkre8G+eAwt83zWhW5ueBLkYJaOs1VciBeFeXik8/VDpKupx
+5QHMwDXps51cxQJKgE3LKpB3Reut2+XmLe2+Z8jjOxnCLWWjXxPCAXALcZqXqh8=
+=HBqB
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch
new file mode 100644
index 000000000000..306ffd9cf991
--- /dev/null
+++ b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-underlinking.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/468522
+
+--- configure.ac
++++ configure.ac
+@@ -98,6 +98,7 @@
+ 	dbus-1 >= $REQ_DBUS_VERSION, \
+ 	dbus-glib-1 >= $REQ_DBUS_VERSION, \
+         libcanberra-gtk >= $REQ_LIBCANBERRA_GTK_VERSION, \
++	gmodule-2.0, \
+ 	gconf-2.0, \
+ 	libwnck-1.0 \
+         x11 \
diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
index 3af49367bc94..a8ac2f0fde0e 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild,v 1.13 2012/01/28 02:17:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild,v 1.14 2014/06/02 17:56:49 ssuominen Exp $
 
-EAPI=3
+EAPI=5
 GCONF_DEBUG=no
 GNOME2_LA_PUNT=yes
+GNOME_TARBALL_SUFFIX=bz2
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Notification daemon"
 HOMEPAGE="http://git.gnome.org/browse/notification-daemon/"
@@ -16,10 +17,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.4:2
+RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2.18:2
-	>=gnome-base/gconf-2.4:2
-	>=dev-libs/dbus-glib-0.78
+	>=gnome-base/gconf-2
+	>=dev-libs/dbus-glib-0.100
 	>=sys-apps/dbus-1
 	>=media-libs/libcanberra-0.4[gtk]
 	x11-libs/libnotify
@@ -28,15 +29,23 @@ RDEPEND=">=dev-libs/glib-2.4:2
 	!x11-misc/notify-osd
 	!x11-misc/qtnotifydaemon"
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.14"
+	>=dev-util/intltool-0.50
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig"
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS"
-	G2CONF="${G2CONF} --disable-static"
-}
+DOCS="AUTHORS ChangeLog NEWS"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	epatch \
+		"${FILESDIR}"/${P}-libnotify-0.7.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
+
+	eautoreconf
+
 	gnome2_src_prepare
 }
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}