From 898430fdf1567ec7b9c78962dcdef060db8f14fe Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Tue, 4 Oct 2011 20:59:55 +0000 Subject: [PATCH] Have a version prepared to work on Gnome2 with nautilus-2 and another one for Gnome3. Package-Manager: portage-2.1.10.20/cvs/Linux x86_64 --- sys-apps/gnome-disk-utility/ChangeLog | 11 ++- sys-apps/gnome-disk-utility/Manifest | 18 +++-- ...-disk-utility-3.0.2-nautilus2-compat.patch | 35 +++++++++ .../gnome-disk-utility-3.0.2-r200.ebuild | 72 +++++++++++++++++++ ...d => gnome-disk-utility-3.0.2-r300.ebuild} | 2 +- 5 files changed, 126 insertions(+), 12 deletions(-) create mode 100644 sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat.patch create mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild rename sys-apps/gnome-disk-utility/{gnome-disk-utility-3.0.2.ebuild => gnome-disk-utility-3.0.2-r300.ebuild} (95%) diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog index 02cd29d89748..6e422ed5ddd0 100644 --- a/sys-apps/gnome-disk-utility/ChangeLog +++ b/sys-apps/gnome-disk-utility/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-apps/gnome-disk-utility # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.54 2011/10/01 20:44:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.55 2011/10/04 20:59:55 pacho Exp $ + +*gnome-disk-utility-3.0.2-r300 (04 Oct 2011) +*gnome-disk-utility-3.0.2-r200 (04 Oct 2011) + + 04 Oct 2011; Pacho Ramos -gnome-disk-utility-3.0.2.ebuild, + +gnome-disk-utility-3.0.2-r200.ebuild, +gnome-disk-utility-3.0.2-r300.ebuild, + +files/gnome-disk-utility-3.0.2-nautilus2-compat.patch: + Have a version prepared to work on Gnome2 with nautilus-2 and another one for + Gnome3. 01 Oct 2011; Samuli Suominen gnome-disk-utility-2.32.1.ebuild, gnome-disk-utility-2.32.1-r1.ebuild, diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index 640171551c2b..e0957f1eb249 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -5,21 +5,19 @@ AUX gnome-disk-utility-2.30.1-optional-avahi.patch 3265 RMD160 f6e29b0421b5b7feb AUX gnome-disk-utility-2.32.1-non-utf8-crash.patch 1044 RMD160 d24bd35f6f3b02c9939e5a48b17ee58657272cf5 SHA1 a4cec1a87279c11d9f79e8b9ffcbec1a1b0f3acb SHA256 818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526 AUX gnome-disk-utility-2.32.1-optional-avahi.patch 3271 RMD160 6e401303d5bfefa01f843992898dd3c1e4bf4187 SHA1 2672f51196101503688ca73be17bbddae0ee897a SHA256 30965971604b96489857eb7d2703ab0e7ca053ded5cd50fd5fed9ceb34235df2 AUX gnome-disk-utility-2.91.6-optional-avahi.patch 2665 RMD160 e6019f814f03ebacb7f4607dfd2e91f0a5bc3ced SHA1 131f04f14fa105712d555c617d699fc02fb18215 SHA256 2698b158a2552a9650d07634e478d6d15a26cd18c881f065cd14f81dadf5d867 +AUX gnome-disk-utility-3.0.2-nautilus2-compat.patch 1070 RMD160 1f480339e4efc22255964f736f8ab7c94866c03f SHA1 2f64ab587d622e614c166f4ccc1bb1fb35dd14f3 SHA256 217317df21ecad827d6e462810036c75f182f8efc8f600a407fddd862211356c DIST gnome-disk-utility-2.32.1.tar.bz2 2216871 RMD160 d3572b44890e2aa89f2268ba684ba80732dd0ea1 SHA1 afd03dc2c59629d4789045e0b967bd17b71f70f2 SHA256 fb3f6c8962eca9706fd96e1f0b431c1284536298bc927e8413e763054c618e99 DIST gnome-disk-utility-3.0.2.tar.xz 2002052 RMD160 7355f13be7c67f10f3fb337cccfe8bea7ec2e36d SHA1 61718232756657542c89a0b3355a4fdee78b7ffd SHA256 7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5 EBUILD gnome-disk-utility-2.32.1-r1.ebuild 1976 RMD160 0c518d6a24cb90f7330ffd5cc0bb67353941fb65 SHA1 26ff3fcdc1fbf46cf94788cef1ea18724b356925 SHA256 288009cea70496a08b6fc5cf68c7ff49469a4c9f2a10de7e681729688c35927c EBUILD gnome-disk-utility-2.32.1.ebuild 1824 RMD160 be418360a42850747335794d6676383828296f19 SHA1 a21025bb4d10ae72ecc3a8029d03438541ff7280 SHA256 ebf42f5734a8f5fb45aea269121d49c65ad63170152c29d540d18157c489f5a4 -EBUILD gnome-disk-utility-3.0.2.ebuild 1772 RMD160 9d374e8d30ce805fc2b2a5c8532c37b7728d386f SHA1 9a633c524924c27edca136b079b9a7d009e5227b SHA256 2c4b9aa99e802a48f472034b565614b23055d348321d2bafafec19c9f49100ab -MISC ChangeLog 8809 RMD160 3e29e06755fc33e96f6ae000cb7359a80db15103 SHA1 b6b940e85eda413184b325563aa05f978c83f04f SHA256 ab5d2712c9ed05ef20d2fb97e266554ef28a762aec61bfd101017ec850b85f93 +EBUILD gnome-disk-utility-3.0.2-r200.ebuild 1901 RMD160 ee62f9b57d22e6b64ebb1f1cd0383741d9ca8a08 SHA1 1622d753ca06fef87b8a3c944f3d2f48dcbb54fc SHA256 6d154d891c69c683521e906aa3310048da382ec9d942ec713a6127e01b496929 +EBUILD gnome-disk-utility-3.0.2-r300.ebuild 1773 RMD160 095b17341722b2bfdeb611818955a4a48d070a85 SHA1 ca519e5711a459ce49361a681138b8f3235545cd SHA256 dbd5292a96247b3ff24b939b23f291d964b7c1876125e644eda0d789cc6223c5 +MISC ChangeLog 9205 RMD160 e8bd3d0e677370a615bfe58572cd717dd45f3583 SHA1 546ea87faed02beb542eb58443a539de40b90a03 SHA256 1212e1eca4aaed28f18308081c111ae82b6b4470befe6f63bc7397e21e41a557 MISC metadata.xml 411 RMD160 a1c12c7620efc6350a471ec6dfa23c86603f4a63 SHA1 3a1d45a1c201852a8067b535b214777ad95754ab SHA256 194a3aa8e459cf8efd11f19a1368a0764877a356578aec429100ffd969cd34bf -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJOh3vJAAoJEEdUh39IaPFNRGEH/j1BNrSfFTGb0I2oKk6MMK+N -56DXoQAPpFI0TK+cSGxeY6kFdSnJvsMVxPhp11B1p2ZZZPMoPnjKvkiDJaDypiBU -fxXwfdGkZnNboq+p/uw4/27bI1p/zr4NgXzAQzn48fDR1stBENpmTfN1zQ+ZKQ7L -+xv7AOGbX4sGw9wyq5jv5Hki944w2UovjLqjbK4M2kE8BcfBpzGXskPGVfV0JbqN -HUmMQJNrx9DLSQGwY6J9xpX1o0QQT9uIG2B9xwz7BHpOWokP+xV1t6vajB+N+rVi -d6pVnj9o7tMCbsDsmdrOQ836OdGGFtybZ9+KegTJ/Yo2KKfNrj7p3FhbwMunPSc= -=jH9r +iEYEARECAAYFAk6Lc9EACgkQCaWpQKGI+9QU8wCeOqNJ6FXTCutZ+Biltdl8d/EY +zbsAmgLsyVmAYbD1pxQOyT8K5d4dsG/4 +=PaeG -----END PGP SIGNATURE----- diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat.patch new file mode 100644 index 000000000000..20f0f31d94f3 --- /dev/null +++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat.patch @@ -0,0 +1,35 @@ +From 9b6b5c771c14f6c7fc4800273fab88471e3b9cb0 Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Tue, 29 Mar 2011 14:34:14 +0000 +Subject: Use the right directory for the nautilus extension + +Signed-off-by: David Zeuthen +--- +diff --git a/configure.ac b/configure.ac +index 66fa8e8..ad7b051 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -129,7 +129,7 @@ GNOME_KEYRING_REQUIRED=2.22 + GTK3_REQUIRED=2.90.7 + UNIQUE_REQUIRED=2.90.1 + LIBNOTIFY_REQUIRED=0.6.1 +-NAUTILUS_REQUIRED=2.24.0 ++NAUTILUS_REQUIRED=2.91.0 + AVAHI_UI_REQUIRED=0.6.25 + + UDISKS_REQUIRED=1.0.0 +diff --git a/src/nautilus-extension/Makefile.am b/src/nautilus-extension/Makefile.am +index 6c2c82c..c5a9875 100644 +--- a/src/nautilus-extension/Makefile.am ++++ b/src/nautilus-extension/Makefile.am +@@ -34,7 +34,7 @@ CORE_LIBADD = \ + $(NULL) + + +-nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0 ++nautilus_extensiondir = $(libdir)/nautilus/extensions-3.0 + nautilus_extension_LTLIBRARIES = libnautilus-gdu.la + + libnautilus_gdu_la_SOURCES = \ +-- +cgit v0.9.0.2 diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild new file mode 100644 index 000000000000..b8a04eef36ad --- /dev/null +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild,v 1.1 2011/10/04 20:59:55 pacho Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 + +DESCRIPTION="Disk Utility for GNOME using devicekit-disks" +HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="avahi doc fat gnome-keyring nautilus remote-access" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" + +CDEPEND=" + >=dev-libs/glib-2.22:2 + >=dev-libs/dbus-glib-0.74 + >=dev-libs/libunique-2.90.1:3 + >=x11-libs/gtk+-2.90.7:3 + =sys-fs/udisks-1.0*[remote-access?] + >=dev-libs/libatasmart-0.14 + >=x11-libs/libnotify-0.6.1 + + avahi? ( >=net-dns/avahi-0.6.25[gtk3] ) + gnome-keyring? ( gnome-base/libgnome-keyring ) + nautilus? ( >=gnome-base/nautilus-2.24.0 ) +" +RDEPEND="${CDEPEND} + x11-misc/xdg-utils + fat? ( sys-fs/dosfstools )" +DEPEND="${CDEPEND} + sys-devel/gettext + gnome-base/gnome-common + app-text/docbook-xml-dtd:4.1.2 + app-text/rarian + app-text/gnome-doc-utils + + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35 + >=dev-util/gtk-doc-am-1.13 + + doc? ( >=dev-util/gtk-doc-1.3 )" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-static + $(use_enable avahi avahi-ui) + $(use_enable nautilus) + $(use_enable remote-access) + $(use_enable gnome-keyring)" + DOCS="AUTHORS NEWS README TODO" +} + +src_prepare() { + sed -e '/printf/s:nautilus:xdg-open:' \ + -i src/palimpsest/gdu-section-volumes.c || die "#350919" + + # Keep avahi optional, upstream bug #631986 + epatch "${FILESDIR}/${PN}-2.91.6-optional-avahi.patch" + + # Keep nautilus extension working on Gnome2 setups + EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-3.0.2-nautilus2-compat.patch" + + intltoolize --force --copy --automake || die + eautoreconf + + gnome2_src_prepare +} diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild similarity index 95% rename from sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild rename to sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild index 230b1b0a9b43..64e530a0b0b0 100644 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild,v 1.2 2011/10/01 20:44:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild,v 1.1 2011/10/04 20:59:55 pacho Exp $ EAPI="4" GCONF_DEBUG="no" -- 2.26.2