From b00aafce8f94cf9f05ba7566b90da1039528197a Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Wed, 2 Nov 2011 16:38:52 +0000 Subject: [PATCH] Add 3.0.1 from the gnome overlay. Prevent file collision with nautilus-3, since nautilus-3[sendto] installs its own copy of libnautilus-sendto.so. Drop old. Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64 --- gnome-extra/nautilus-sendto/ChangeLog | 10 ++++++- gnome-extra/nautilus-sendto/Manifest | 26 ++++++------------- ....0.ebuild => nautilus-sendto-3.0.1.ebuild} | 19 ++++++++++---- 3 files changed, 31 insertions(+), 24 deletions(-) rename gnome-extra/nautilus-sendto/{nautilus-sendto-3.0.0.ebuild => nautilus-sendto-3.0.1.ebuild} (74%) diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog index 648b09b9074d..e61620343faa 100644 --- a/gnome-extra/nautilus-sendto/ChangeLog +++ b/gnome-extra/nautilus-sendto/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-extra/nautilus-sendto # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.55 2011/08/18 04:44:26 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.56 2011/11/02 16:38:52 tetromino Exp $ + +*nautilus-sendto-3.0.1 (02 Nov 2011) + + 02 Nov 2011; Alexandre Rostovtsev + -nautilus-sendto-3.0.0.ebuild, +nautilus-sendto-3.0.1.ebuild: + Add 3.0.1 from the gnome overlay. Prevent file collision with nautilus-3, + since nautilus-3[sendto] installs its own copy of libnautilus-sendto.so. Drop + old. *nautilus-sendto-3.0.0 (18 Aug 2011) diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest index 8268db0303f9..b84092018b3f 100644 --- a/gnome-extra/nautilus-sendto/Manifest +++ b/gnome-extra/nautilus-sendto/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX nautilus-sendto-2.28.4-gseal-enable.patch 1345 RMD160 04f7a02c986e381e3a4e9a34115826d9af24446d SHA1 bb675b34587fd00971f60f09317418a539786e94 SHA256 2e42e5ecf35cfdf348dfa2d77b94400e92dc8c0eb8150788c657f1fc1dc68126 AUX nautilus-sendto-2.28.4-item-focus.patch 1009 RMD160 b8a159a58354fc5aea6257e05b4a171f5dabd1a3 SHA1 5fcf60028f772ad5c5c451266c92a3218c86f4b4 SHA256 e145e6a2992090ee1cbedd850121b7a921c8025eadca697a80db0504831adb18 @@ -13,25 +13,15 @@ AUX nautilus-sendto-2.28.4-unload.patch 4212 RMD160 46b2c14e176d0f5bf5327f499dd7 AUX nautilus-sendto-2.28.5-commandline-help.patch 1123 RMD160 618ae37faf19b5ad5bfae0f28b21462d76969fe5 SHA1 1d3ec1fc8a4d545d47cc0030ae2b2e2ac1fc38fd SHA256 f5a928cf771d55f5514b73ff5aa509df73ed1dae4d14b418ddebb256c4940e8d AUX nautilus-sendto-2.28.5-fix-memleaks.patch 1596 RMD160 f3b335465c7cde3ec177d121a5631acf020c4891 SHA1 6f3439c22aade6dcb88efb7521fecf85e5d9c9a4 SHA256 dd78e9382bd5e55f262c8609a50b9daf5bfb4c45c8d9d27e732ca74b8a338388 DIST nautilus-sendto-2.32.0.tar.bz2 446731 RMD160 3ef5fcaac94de0bf7411dc4b74722472e7c316a2 SHA1 d02d13896bbb6ea4ee358401359b1c51eaa5c898 SHA256 890090b24381d91f079610d5454cb786a3ecefc91fa06649b2222be9bb02269a -DIST nautilus-sendto-3.0.0.tar.bz2 427744 RMD160 b30fb34eb58091a7cc428a4a7142eb8f29addf75 SHA1 e68e761bc08c812693505ed7da1bc0088cf9373d SHA256 8821c6aab186ff3aa852438b4f2b64dce9f68e264908ce009e331bac74969e21 +DIST nautilus-sendto-3.0.1.tar.xz 376892 RMD160 d1fb9824e3682aa7dd3d85e3f55865ab114a04a4 SHA1 dfe6189ad7a02b88f50dd37cb5b2a4eba7d28c2e SHA256 34617084b731db8bf3ffb517497d5645283f4aa7a9ebfa2a05da8c12066a0f14 EBUILD nautilus-sendto-2.32.0.ebuild 1465 RMD160 1fe0d1c74ba214607f68ea3e8b29b4ed842ff306 SHA1 9ec7ac34e894f672a01bf7287288912e7f7cc4eb SHA256 c70b511d3d677c6a22f72f3bd4b0f85e864931d78b1c3aa24912d48335d5e91c -EBUILD nautilus-sendto-3.0.0.ebuild 1413 RMD160 9c683fad8d7fefd0b7ef07c31f05169d19c8f73b SHA1 81455be517bbdcdd4592ad5283b65855574cce05 SHA256 67494c371f2ef43fb8fbf0c3922c74442ae75a7436d32e6b147d7414a1b99d49 -MISC ChangeLog 11479 RMD160 eda0c0453fff2402cee8ae16d6f18ae5cf4ead97 SHA1 2073d21d66ac00479bb2112527b513a01cf6f062 SHA256 5a507f3880d9571ce0c5913f66b2ca2dde9f2f3f6b9af3c8b50ef33196ca7ae0 +EBUILD nautilus-sendto-3.0.1.ebuild 1659 RMD160 1db50607037b17f7ea0173f4b71733178dfdbfb0 SHA1 9d778e2be88417862dbaa577effac7a82140b184 SHA256 fa5274a534afa416b8ac82d320077ef42d6dbb05ffcd1a11318fe21557fed088 +MISC ChangeLog 11805 RMD160 409209f87ae3bc49d2ff73a9e9d43f6b5d861a7c SHA1 7e18bec72d6e4fcf89612cd25d976013d76c8ee6 SHA256 7e0b35a499c84e1833a96318d3da02d7045fe2b9089c9940926b4975a8c1d48e MISC metadata.xml 538 RMD160 13100e1d7c26bd5d8d51e867b56e1b01a5f72a2a SHA1 623349194297e9695b1da78e7ab0b9c49a39c209 SHA256 350928205d9ba8058c629b614fbf047bc1f21e72170f850182d52215bc17a3a5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOTJixAAoJEO/kOhxWD91k9okQAILz5xVk1Xjf107o/W7O3pPm -0pevcocAent/KONYVdIa0lOLfrcscKrSzAW4GAxB/UgS5RNhmXzXyuSOKkSzqFM9 -A+geBHEnAmZT2sjb2crVqMkXGey4NTD0N8eqLwuwvCcgKfBsizThxOkxqb735DrN -kB2vFNDoaCSOUa1AmOp0U7NnT++WyAnMgPHeEMK3ZMVtNgFU0i4nsa9XzqyzEUA6 -P2T/6eWYwi13Op2X9sZ82TBda1nbWZ06Zdv9L0b4Y7X0uWTHoTaEVkLPd6luy45R -2GJwFl2/9krrvlFLjQFwmnlyO/GvraFElrvOKk4Y+KkM3ozAeKfEVIscPlHK3/dy -HXlXTh5f52TgRsGe73p+BAKuxL1kC6tap+NLaNkCVPnE+f8OKSbFb+8VRqfFjSH8 -1a0LBtnWRYe4VzpDJwo4zdljzQ1v+Hp/EFPFf9S56sa2V87KUIG6rY3GZToDAI86 -w/SUqxE1G6DHs+WG3u0q5Rd8R9BeXbp3HrgDH5Y07JCRQSNK4bFq6C/1UjPDJluW -N1iHCOKZPGGfkcSM1Zn69XNVlEr7pk+E3+/IgJCbfRowst2786wgpFqPDbJHqf4i -+prJy9nM7LqAft/C7CaXpNwZfO0OdGX3DJQ1NUJoFulTuYMoeaM+qNZG6CPpat5v -LsbPJaHccPdwPbrjFIVR -=Oc9g +iF4EAREIAAYFAk6xciEACgkQdjK8w9WeBnAQygD/fWmtnS58OrCOgVSdujNuJ7er +/puTHB2wnGl7CfzDpYMBALlSts/Wn9f+j4dcmDsGsRXKrDHzdbRdl56hnY/ZwOjz +=hYjQ -----END PGP SIGNATURE----- diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.0.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.1.ebuild similarity index 74% rename from gnome-extra/nautilus-sendto/nautilus-sendto-3.0.0.ebuild rename to gnome-extra/nautilus-sendto/nautilus-sendto-3.0.1.ebuild index 740a3979a182..efa100bb4309 100644 --- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.0.ebuild +++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.1.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.0.ebuild,v 1.1 2011/08/18 04:44:26 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-3.0.1.ebuild,v 1.1 2011/11/02 16:38:52 tetromino Exp $ EAPI="4" GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" GNOME2_LA_PUNT="yes" inherit eutils gnome2 multilib @@ -17,9 +16,8 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" IUSE="cdr doc gajim +mail pidgin upnp" -RDEPEND=">=x11-libs/gtk+-2.90.3:3 +COMMON_DEPEND=">=x11-libs/gtk+-2.90.3:3 >=dev-libs/glib-2.25.9:2 - >=gnome-base/nautilus-2.31.3 cdr? ( >=app-cdr/brasero-2.26.0[nautilus] ) gajim? ( net-im/gajim @@ -29,7 +27,10 @@ RDEPEND=">=x11-libs/gtk+-2.90.3:3 >=net-im/pidgin-2.0.0 >=dev-libs/dbus-glib-0.60 ) upnp? ( >=net-libs/gupnp-0.13.0 )" -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + >=gnome-base/nautilus-2.91.1[sendto]" +DEPEND="${COMMON_DEPEND} + >=gnome-base/nautilus-2.91.1 sys-devel/gettext >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.35 @@ -54,3 +55,11 @@ pkg_setup() { _use_plugin gajim _use_plugin upnp } + +src_install() { + gnome2_src_install + + # Prevent file collision with nautilus-3 (which installs its own copy of + # libnautilus-sendto.so) + rm -r "${ED}/usr/$(get_libdir)/nautilus/extensions-"* +} -- 2.26.2