Rename notify-send to libnotify-notify-send and symlink it to notify-send with USE="symlink" wrt #379941 by Michał Górny

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

4 files changed, 80 insertions, 15 deletions

diff --git a/x11-libs/libnotify/ChangeLog b/x11-libs/libnotify/ChangeLog
index 63571b27a937..6b5537a9571a 100644
--- a/x11-libs/libnotify/ChangeLog
+++ b/x11-libs/libnotify/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libnotify
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.78 2011/11/18 22:17:12 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.79 2012/01/23 01:50:33 ssuominen Exp $
+
+*libnotify-0.7.4-r1 (23 Jan 2012)
+
+  23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libnotify-0.7.4-r1.ebuild, metadata.xml:
+  Rename notify-send to libnotify-notify-send and symlink it to notify-send
+  with USE="symlink" wrt #379941 by Michał Górny
 
   18 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
   -files/libnotify-0.7.1-gtk3-tests.patch, -libnotify-0.7.2.ebuild:
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 3ed3adbc1808..63010d103a6f 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -3,17 +3,18 @@ Hash: SHA1
 
 DIST introspection-20110205.m4.tar.bz2 1220 RMD160 c520adf7edf0e56012138208b45bed9df2a3e62f SHA1 092adcee1acce39e89069db0f3e8b4cb7ad89dea SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2
 DIST libnotify-0.7.4.tar.xz 272016 RMD160 a34aeb657055d5fe63e0c26ae67379067f964d2e SHA1 e5bb0d9f6999764ef090c66cd531b774e693a9cb SHA256 e3c58345112672c2cbb05a67512ff6c7028892df7a34746e2162fe76d9877019
+EBUILD libnotify-0.7.4-r1.ebuild 1555 RMD160 744980097187cf21c0a1a5b5944a6ed9df66c472 SHA1 93e042dd4aa7e137625e65dd12b677a7a8ea986e SHA256 b99a1725d319c24c5d8c9698d797e1895a7db998c58b7d18e11e581bcf67a09e
 EBUILD libnotify-0.7.4.ebuild 1386 RMD160 9f792e6d9374a4d4495a07cf4ee92c8a0eefc1e7 SHA1 d835b2dab15d4851a131a454bb4c57efe68d8b10 SHA256 bf31185674947df96a7da3a6ff57c009e4cb7b8e608870a3efd146de5970c4e6
-MISC ChangeLog 10169 RMD160 3c6e398b268bf32746d6e5d6d6d7457ea010a0cd SHA1 953659a70ea2e48cfd4de49c3629b2df45a17d23 SHA256 556435f86677628acc38caa2a06def984ff2bbaa7f0dcc135bb6c5096c5f1afa
-MISC metadata.xml 280 RMD160 eb9fb7d60a900109c8a342ae4892a768c18cb846 SHA1 d0c617964f30c9f28817bcf8871018cb0d797888 SHA256 4609b8a9d20b2360573b1da47869971dc0aa1849cf8eb056a7c1c96809ff9f85
+MISC ChangeLog 10430 RMD160 112960ea66fa9ed42110914d0ff80cad380c6312 SHA1 4f924e1186a22c0f394211aa5242e1cd76478768 SHA256 ad8d7fc0ff50a25b8d587b590fed5ebf369ffac64b057a3268a887a25efb102c
+MISC metadata.xml 374 RMD160 c8e1c1db4491af83bd43499c000e67981967fd0b SHA1 7b7a4da053cb9f7a751b37fd822da2c7e15a8f71 SHA256 2caf7fe34938341ea8d0e0b3cf48c77b042c2883b3559d95dbf1a5bd9cf63a6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOxtkJAAoJEEdUh39IaPFNqVkH/iPCyG2M7bLyHO+IkBDvC+++
-Sdde7Qlhpt0S2SYXxU129aTJ/l4kJ2zID+iAoq/yuMRSTzhsUEIPzJIKtVonnIre
-mHxHd+bONFkwkjLNVr7RuL5v8OhleTEE5dpJPmW044aI8kqkNX9UflppzI8JBCwM
-yiem/b9cMzqC8BWodR2BV5TDsWq5ZxknVY3DQj/vMfkpKQbC4SAOmxZe7iBVNKLl
-VDG1ZP4l53qrGrb37EFNml/lW071RUNlKlg9fT+0oDxfWUA5DsrFp0bMhZc1wLL/
-4XooK7OOBT1K8kcR8zrFxRers380Zr1Sg/DjVPtHJ4dDSoywlXu7SF4uwlcg8M8=
-=UAzt
+iQEcBAEBAgAGBQJPHLxgAAoJEEdUh39IaPFN/QIH/jOHRaEZjjYWScJ7xLul+yCF
+/cq0IvZwtS9z1VC8qf5mhyNeOE8hJ5GTnZfqd9PmYiWPOICbDkj3uvSsaRGA/2nG
+qhsOd8WM8dyHBjG8C0dG+RMD3j0cSIeB+KwelRt+WsM+xixaD0giUpu2ThnhdhYK
+Z3tuHiqPvBV/MlZtL7R1Ep7KvmzxZRIeN4JlPvmjkuxjuIH0gWsvYN3769LoMwwl
+dESBr0TVy/MMJjN3GUnhDj3LoOOTdt3jv9+VXZkUMUxpJ2/ShVAA50BHHK0Ci3qu
+6ybBuPl6RmA8DiAOc9gvl1wH42aJc5uOA+4Wk81LKq8GT4d/gja1fuMHKFYxm9M=
+=p7jv
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libnotify/libnotify-0.7.4-r1.ebuild b/x11-libs/libnotify/libnotify-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..fee1d00a3b92
--- /dev/null
+++ b/x11-libs/libnotify/libnotify-0.7.4-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.4-r1.ebuild,v 1.1 2012/01/23 01:50:33 ssuominen Exp $
+
+EAPI=4
+inherit autotools gnome.org
+
+DESCRIPTION="A library for sending desktop notifications"
+HOMEPAGE="http://git.gnome.org/browse/libnotify"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="LGPL-2.1"
+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="doc +introspection +symlink test"
+
+RDEPEND=">=dev-libs/glib-2.26
+	x11-libs/gdk-pixbuf:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.14 )
+	symlink? ( !x11-misc/tinynotify-send[symlink] )
+	test? ( x11-libs/gtk+:3 )"
+PDEPEND="virtual/notification-daemon"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_prepare() {
+	sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
+
+	if ! use test; then
+		sed -i -e '/PKG_CHECK_MODULES(TESTS/d' configure.ac || die
+	fi
+
+	if has_version 'dev-libs/gobject-introspection'; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable introspection)
+}
+
+src_install() {
+	default
+	rm -f "${ED}"usr/lib*/${PN}.la
+	mv -vf "${ED}"usr/bin/{,${PN}-}notify-send #379941
+	use symlink && dosym ${PN}-notify-send /usr/bin/notify-send
+}
diff --git a/x11-libs/libnotify/metadata.xml b/x11-libs/libnotify/metadata.xml
index 0b2305e0efdc..dfd071461f7a 100644
--- a/x11-libs/libnotify/metadata.xml
+++ b/x11-libs/libnotify/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
-	</use>
+  <herd>freedesktop</herd>
+  <use>
+    <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+    <flag name='symlink'>Create symlink from libnotify-notify-send to notify-send</flag>
+  </use>
 </pkgmetadata>