From: Alexandre Rostovtsev Date: Mon, 24 Nov 2014 02:50:21 +0000 (+0000) Subject: Add multilib support, update license, drop old. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4fc47c6c0eeeed4e9f85858af1c49162c6ba2bf;p=gentoo.git Add multilib support, update license, drop old. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D --- diff --git a/x11-libs/libnotify/ChangeLog b/x11-libs/libnotify/ChangeLog index 27dcfaf5ec2d..a9eff526344a 100644 --- a/x11-libs/libnotify/ChangeLog +++ b/x11-libs/libnotify/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/libnotify -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.104 2013/09/08 15:24:31 eva Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/ChangeLog,v 1.105 2014/11/24 02:50:14 tetromino Exp $ + +*libnotify-0.7.6-r1 (24 Nov 2014) + + 24 Nov 2014; Alexandre Rostovtsev + -libnotify-0.7.5.ebuild, libnotify-0.7.5-r1.ebuild, libnotify-0.7.6.ebuild, + +libnotify-0.7.6-r1.ebuild, metadata.xml: + Add multilib support, update license, drop old. *libnotify-0.7.6 (08 Sep 2013) diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest index 222f8a56457b..bdac8b0b32e9 100644 --- a/x11-libs/libnotify/Manifest +++ b/x11-libs/libnotify/Manifest @@ -1,18 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500 DIST libnotify-0.7.5.tar.xz 275804 SHA256 4378cb47874ba4d5f759b7890d8d28d086e81d3f0bd4f6e84e5ab66d82ffb652 SHA512 f4503a4325e6051baaa702c3c49552092e853929688aa569984c4f044595a268256a91c4b68c68af79528e0b50f6e9968a7d55d4cbcdb9679a3376ed9f884285 WHIRLPOOL 5eb4bd5ba8d8aad09a33b44ac43089ac748c0cf810876c797d79c387b4356b522724b3596ff772cd019b80c09785d514c0e097af0a70a21d00e04f30e77ff10c DIST libnotify-0.7.6.tar.xz 280388 SHA256 0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837 SHA512 5d656ee7ee5caeb95aec4adb973795dc72fc620cd36b9fe3d4f910951945bd5df70ee1c422cd6aca9c38a9ba2760562e479fc8fb9269449924a5b24d762d03df WHIRLPOOL e619c8d10790f5b78730a2599c407bc951de68b189f460c72999776eaf92014aded0953ca06398cce7ad09fd8c87e1c7727cea4f4c81eccee0a8b2f2bafd195b -EBUILD libnotify-0.7.5-r1.ebuild 1454 SHA256 0bbc34abbedb2180d41c9e1b725d5fe8accce4eb943a3ff90dabb3e1ec2360e8 SHA512 60358d23bc4ee1815edfd9ace4c0adfb6782b9ca0c3e9bf40efa24cf6ee25d3ce9394680015b8c351bea1b7f526b92059763d47f734e7aa3a709e93ce0cc4ec8 WHIRLPOOL 6b6145531dfe9cdec92c9969daea37fa07bd2ddafe20e09a0d7086d713c31dd0bacfd015dd7a52bcbea70eaaef19ca3063f2e8853d5916a90a4689ebca6842f2 -EBUILD libnotify-0.7.5.ebuild 1560 SHA256 2381e46b9b7a531401dccfc1d913c24c4d6ef7845b115c1317bb6b57a2790964 SHA512 ee9e705344c81c56b0456a04a713ba6a88daf963ed019a8311abec594fb8d23a6a149a4615858f4d732b6789941d5128fc7e6d2cae58d9f22b4af662259cc56a WHIRLPOOL 729f88fc44af26e840cdb03586a3671a85604618549cb1ce454b9c4fb28fa55adaf68c5e7f31c8bc645c8dc44cbb5ff68d61019cc2f3a784768c06c659146cfa -EBUILD libnotify-0.7.6.ebuild 1428 SHA256 24b6bcc75ab43a6cf2803187894ffe9adbd4545c6b34e45e021aea5d4835461e SHA512 0777ac7b4847512e82d71216d9b74fea9e374bcb2a2a6f999803d69e3605dc10047a0aea54f14c2118b93cec0e737707ed27ed93f6b940e2959b61f8952953ce WHIRLPOOL 476d90854decae37ab81e3c6136aeb10153af8fce72a8049ac5ded4f8a61821414d60af096ffd77be80cd73d82d923395c7dc6be18c7ee550f1b3ebb51fc0e11 -MISC ChangeLog 13646 SHA256 5db6096d38a59595efe625270c4addbfe318238b71670f748f8574c35b3d8b02 SHA512 4186efdecb97f51feccee438859b3fee069065737e8e3fe90c04ef5325f89ae6ce21da41b8fd5b310b83618ced815f4991b6c317c4066f1fedda52bf59798bd7 WHIRLPOOL 77a8d20750460cff634ebd02dd64876c34143bc2f83f130abead4c1cbff1aeade10864a1a0a72f70e51d2cee814ebb48bef7baef8476a2ccc776cbfeef86b62c -MISC metadata.xml 374 SHA256 2caf7fe34938341ea8d0e0b3cf48c77b042c2883b3559d95dbf1a5bd9cf63a6d SHA512 8d459edc3c03a0353edf518d66586142152d8392a07d9f3a721165f2e853bbde009e341a382cd951a8b025366646b7c25a04017388331edfe56144fe36962d36 WHIRLPOOL 42ebbb9e163b18b1c8927c9e18ee8f014785a066ba9bf3dc08d9220da89bc508dfde195423b7ce42910a50a9326698848d01cb347e315b77187108a2997c0fce +EBUILD libnotify-0.7.5-r1.ebuild 1461 SHA256 2d8e91d62dd057616d821a1b68da70a07a901f7f3110ec6b704f507c511381cb SHA512 861ce6928b04292451c9ec049673b339243d2b702d887d750d63f8b327ee75c2c4e079c33855758b3b560f7a0973270e03e27e3b4b25c1d09df4f4ff20b4816a WHIRLPOOL 77baa26610f18ac9a7302ed0b091e1b81d189ab40b997a9b1d5502635767fa4751b71d301091854df03a1cefc647d143e81cc8ff2a3d0a433b6fd1a51fbabcd9 +EBUILD libnotify-0.7.6-r1.ebuild 1912 SHA256 5fd26c3a915d89abdd377fc1e88b4d1d9c55542852f467f07ee602873f51dc13 SHA512 430eb93c6f43eda019bb1afcd38e20cf221c7a1f24fbcc446b55a554b6a8e1d99a159e13def983ece6c66a0ef403384c3ba5b63bcca16da9e976fa3b2242f11a WHIRLPOOL 3391ece39cb701be57a48e63f4092e6b5bbffc09f0b84bf8ddfc26489a124edb602b620f08b3aa1ae3ee09ff46c33df3cf62045dcdbe5586135ac3f336ceddfb +EBUILD libnotify-0.7.6.ebuild 1435 SHA256 2cb4c84f2cf2eaaa9f9df3e4c52c063b69ec027f82b43093c71304d7f40aafbd SHA512 451ea54bf1db39875c74fe4dec24438845dff4bd549f0084913939cdddefe84a6dbccde46ff3a13bfa51fb724eb56c7d7f8f098f218633ade47078d1867d1ce7 WHIRLPOOL d2037f97a2dba098421249671c74360c10febc6f845d577d6a8a090d178bb1f4aa82f8a5d2498f0d186a50f2f39c4b34fb5609927a29d104336a709c853be028 +MISC ChangeLog 13919 SHA256 789d929ec7cd6e214317c3c53f73fd60a578c9694d3947a78245f2d646236d9a SHA512 f2efe01650f128efd2e3325f77ec96425da263d3e16b260541b36ad96eb600a2f26db53c83f02be4cda5ca80271edd9320f1e4ecc797931a403af238694dff2c WHIRLPOOL 272636ff637ba06cddd50e48c6d6f2e8a52fe058b049f549ced48e6ea79857f432f33ba8a4db8fdd45ff7b79dcc17269a5a5897f3f5e3931c25996cb8c48fc3b +MISC metadata.xml 166 SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56 SHA512 e83280bba00e234b1be03fa85705f2085efb89dcd5a37e27b8357542080c28a3ddbcf326acb81494370fe0b12fe9f82541f8947ed289f05612c29c7c08c363c2 WHIRLPOOL 706c229f08da0750da9b5b8b642adf687ab31aee0b53e97b54dc678dec72162dbacbf3ed6ad9ef8c97897cec050a74b7153339133f8fe35063e5febd87b7d121 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.21 (GNU/Linux) +Version: GnuPG v2.0 -iEYEAREIAAYFAlIslrAACgkQ1fmVwcYIWAbVKgCgvCn10nDWxBupWLJPCQ6i9R2R -GAEAoMRsKdpIHs5/JrU0Hs+URSiF1nc5 -=i3+w +iQJ8BAEBCABmBQJUcpzoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx +OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNwJcP+gPumozwPqnyYdD3EBfYh7xm +ziQdae8JdRAanBARfFdWmvmU6n5HqM/TrZXRd5EFWqTsr2LL4ZZhAQFAPNCkUYF9 +ho6FRowjZPOKoH9gmSNqzBXJqb0famtLPz89XzAY+gYGgcwOgmUfFr89n0/Qg/ee +NxNg7++VJv+LAUC4JtbdvtRTT01lT2KXUAuD7W/gE+ceP/C9m6ssV+W/eOClcDI/ +CoBEb32Dn4/NrcVEdxCtkKYRlXoq/CRu345d75nTEx1ecgqOeH15EjV/wI/qcjHz +6YRMZC+HDbQznTLaIQ/Y9owq8tpVraO/OWuroX9ZzLzk3uESWrJPszqvYE1WBhOL +jDdAKfT60NxoSOOzXUDD3SHA6LWW/L6tU5Lv6cBGlpO9Xq0ppN2i+GgSaVLg9tlW +MHcecIfI2gIWLgstZmnWVkDokLbVVSB4/xYlxzC3z1I0dKlKno7sDKpprIUspc+p +UCwgsGwgWpMuYPjdTfgv6O+BQGxfGuAMxy77yhFCE9MbYcus15IAyv8zXmmnrxz2 +QcCbxdO4RUXBj0m091eNw0N6uCwhonEppVjCXL1H5P4Fzt9+RhOu/2lbAVyI7qra +x6jk7WaIBNQ89fINI8exK2CfZtaoKnA5oGccXwzEHKSJMj9JKixyOf375pFsDuDu +5xbsv3Zwo1FRlrQCHShz +=uuvS -----END PGP SIGNATURE----- diff --git a/x11-libs/libnotify/libnotify-0.7.5-r1.ebuild b/x11-libs/libnotify/libnotify-0.7.5-r1.ebuild index 18920cbaf204..f3fee9ed4922 100644 --- a/x11-libs/libnotify/libnotify-0.7.5-r1.ebuild +++ b/x11-libs/libnotify/libnotify-0.7.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.5-r1.ebuild,v 1.11 2013/05/01 11:14:34 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.5-r1.ebuild,v 1.12 2014/11/24 02:50:14 tetromino Exp $ EAPI=5 inherit autotools gnome.org @@ -8,7 +8,7 @@ inherit autotools gnome.org DESCRIPTION="A library for sending desktop notifications" HOMEPAGE="http://git.gnome.org/browse/libnotify" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="doc +introspection test" diff --git a/x11-libs/libnotify/libnotify-0.7.5.ebuild b/x11-libs/libnotify/libnotify-0.7.5.ebuild deleted file mode 100644 index 484314cd1990..000000000000 --- a/x11-libs/libnotify/libnotify-0.7.5.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.5.ebuild,v 1.12 2013/03/19 15:47:15 ssuominen Exp $ - -EAPI=5 -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 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-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 - virtual/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 - prune_libtool_files - - 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/libnotify-0.7.6-r1.ebuild b/x11-libs/libnotify/libnotify-0.7.6-r1.ebuild new file mode 100644 index 000000000000..fb265adee681 --- /dev/null +++ b/x11-libs/libnotify/libnotify-0.7.6-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.6-r1.ebuild,v 1.1 2014/11/24 02:50:14 tetromino Exp $ + +EAPI=5 +inherit autotools eutils gnome.org multilib-minimal + +DESCRIPTION="A library for sending desktop notifications" +HOMEPAGE="http://git.gnome.org/browse/libnotify" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +IUSE="+introspection test" + +COMMON_DEPEND="app-admin/eselect-notify-send + >=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-1.32 )" +RDEPEND="${COMMON_DEPEND} + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r4 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + )" +DEPEND="${COMMON_DEPEND} + >=dev-libs/gobject-introspection-common-1.32 + >=dev-util/gtk-doc-am-1.14 + virtual/pkgconfig + test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )" +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 + + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf \ + --disable-static \ + $(multilib_native_use_enable introspection) + + # work-around gtk-doc out-of-source brokedness + if multilib_is_native_abi; then + ln -s "${S}"/docs/reference/html docs/reference/html || die + fi +} + +multilib_src_install() { + emake DESTDIR="${D}" install + prune_libtool_files + + mv "${ED}"/usr/bin/{,libnotify-}notify-send #379941 +} + +pkg_postinst() { + eselect notify-send update ifunset +} + +pkg_postrm() { + eselect notify-send update ifunset +} diff --git a/x11-libs/libnotify/libnotify-0.7.6.ebuild b/x11-libs/libnotify/libnotify-0.7.6.ebuild index 65811b082a57..ddcff86bfe81 100644 --- a/x11-libs/libnotify/libnotify-0.7.6.ebuild +++ b/x11-libs/libnotify/libnotify-0.7.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.6.ebuild,v 1.1 2013/09/08 15:24:31 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.6.ebuild,v 1.2 2014/11/24 02:50:14 tetromino Exp $ EAPI=5 inherit autotools gnome.org @@ -8,7 +8,7 @@ inherit autotools gnome.org DESCRIPTION="A library for sending desktop notifications" HOMEPAGE="http://git.gnome.org/browse/libnotify" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="+introspection test" diff --git a/x11-libs/libnotify/metadata.xml b/x11-libs/libnotify/metadata.xml index dfd071461f7a..2953eb8e0471 100644 --- a/x11-libs/libnotify/metadata.xml +++ b/x11-libs/libnotify/metadata.xml @@ -2,8 +2,4 @@ freedesktop - - Use dev-libs/gobject-introspection for introspection - Create symlink from libnotify-notify-send to notify-send -