diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2012-09-05 19:22:10 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2012-09-05 19:22:10 +0000 |
commit | ac5719fa3c33bf00b0a1aa02f3cc24ec742cbb1d (patch) | |
tree | baa664b9dab0dc8f05fa2744b3a968ff5a974350 /gnome-base | |
parent | remove, in portage now (diff) | |
download | suka-ac5719fa3c33bf00b0a1aa02f3cc24ec742cbb1d.tar.gz suka-ac5719fa3c33bf00b0a1aa02f3cc24ec742cbb1d.tar.bz2 suka-ac5719fa3c33bf00b0a1aa02f3cc24ec742cbb1d.zip |
Remove lots of outdated stuff, use gnome overlay instead
svn path=/; revision=348
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/dconf/Manifest | 2 | ||||
-rw-r--r-- | gnome-base/dconf/dconf-0.13.0.ebuild | 59 | ||||
-rw-r--r-- | gnome-base/gnome-desktop/Manifest | 2 | ||||
-rw-r--r-- | gnome-base/gnome-desktop/gnome-desktop-3.5.2.ebuild | 58 | ||||
-rw-r--r-- | gnome-base/gnome-menus/Manifest | 4 | ||||
-rw-r--r-- | gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 | 6 | ||||
-rw-r--r-- | gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch | 22 | ||||
-rw-r--r-- | gnome-base/gnome-menus/gnome-menus-3.5.2.ebuild | 128 | ||||
-rw-r--r-- | gnome-base/gsettings-desktop-schemas/Manifest | 2 | ||||
-rw-r--r-- | gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.5.2.ebuild | 29 | ||||
-rw-r--r-- | gnome-base/gvfs/Manifest | 5 | ||||
-rw-r--r-- | gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch | 56 | ||||
-rw-r--r-- | gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch | 28 | ||||
-rw-r--r-- | gnome-base/gvfs/gvfs-1.13.1.ebuild | 122 |
14 files changed, 0 insertions, 523 deletions
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest deleted file mode 100644 index 236f50f..0000000 --- a/gnome-base/dconf/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dconf-0.13.0.tar.xz 206212 RMD160 c8efc492e92337a9209ff896ac733393e139e6db SHA1 d119b5ea6ff09524d9c9a0cc3d72205d32f25cef SHA256 ae936eeeee1b9f6346c322f91590194bcce80858a209bc4fa0dbbca4a714021e -EBUILD dconf-0.13.0.ebuild 1704 RMD160 fce8f29a04d0764701702b8920bb4fc192245eb6 SHA1 216c5201064b0fdf177845458b5352f4b3ac3346 SHA256 a3009332154f460291931c8ed66311f04ff3401970023c71921ce7e11d667835 diff --git a/gnome-base/dconf/dconf-0.13.0.ebuild b/gnome-base/dconf/dconf-0.13.0.ebuild deleted file mode 100644 index 7601374..0000000 --- a/gnome-base/dconf/dconf-0.13.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.12.1.ebuild,v 1.1 2012/05/01 19:39:01 pacho Exp $ - -EAPI="4" -GCONF_DEBUG="no" - -inherit gnome2 bash-completion-r1 - -DESCRIPTION="Simple low-level configuration system" -HOMEPAGE="http://live.gnome.org/dconf" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="doc +X" - -RDEPEND=">=dev-libs/glib-2.31.18:2 - sys-apps/dbus - X? ( >=dev-libs/libxml2-2.7.7:2 - x11-libs/gtk+:3 )" -DEPEND="${RDEPEND} - doc? ( >=dev-util/gtk-doc-1.15 )" -# eautoreconf requires gtk-doc-am - -pkg_setup() { - G2CONF="${G2CONF} - --disable-schemas-compile - $(use_enable X editor) - VALAC=$(type -P valac-0.18)" # harmless even if valac-0.18 not found -} - -src_install() { - gnome2_src_install - - # GSettings backend may be one of: memory, gconf, dconf - # Only dconf is really considered functional by upstream - # must have it enabled over gconf if both are installed - echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf - echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf - doenvd 51dconf - - # Remove bash-completion file installed by build system - rm -rv "${ED}etc/bash_completion.d/" || die - newbashcomp "${S}/bin/dconf-bash-completion.sh" ${PN} -} - -pkg_postinst() { - gnome2_pkg_postinst - # Kill existing dconf-service processes as recommended by upstream due to - # possible changes in the dconf private dbus API. - # dconf-service will be dbus-activated on next use. - pids=$(pgrep -x dconf-service) - if [[ $? == 0 ]]; then - ebegin "Stopping dconf-service; it will automatically restart on demand" - kill ${pids} - eend $? - fi -} diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest deleted file mode 100644 index 4fe605a..0000000 --- a/gnome-base/gnome-desktop/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gnome-desktop-3.5.2.tar.xz 957500 RMD160 7fb41b0c5e67b085f922d4c7edfe3b73aec60243 SHA1 61bcb3cbbefefa8a2c417b7212eb6215bae37b14 SHA256 1dd1eeb6d664182639e233fe8debcd80c72c0408606f60fd8771044a94c177a8 -EBUILD gnome-desktop-3.5.2.ebuild 2040 RMD160 60834221a3f3f021222c08b40af535d2a52550dd SHA1 87dcd50b0d5f6b143be3ad8253416dbf1a0178a3 SHA256 f0149852d21dd128b7e456ab3806e0360fcf862f2496687f6322fe65ab41cbeb diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.5.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.5.2.ebuild deleted file mode 100644 index d3a7ac0..0000000 --- a/gnome-base/gnome-desktop/gnome-desktop-3.5.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.4.2.ebuild,v 1.1 2012/05/20 09:59:57 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 - -DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 FDL-1.1 LGPL-2" -SLOT="3" -IUSE="doc +introspection" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" - -# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids) -# Latest schemas needed due to commit 7f3e3d52 -# cairo[X] needed for gnome-bg -RDEPEND=" - >=dev-libs/glib-2.19.1:2 - x11-libs/cairo[X] - >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] - >=x11-libs/gtk+-3.3.6:3[introspection?] - >=x11-libs/libXext-1.1 - >=x11-libs/libXrandr-1.3 - x11-libs/libX11 - >=gnome-base/gsettings-desktop-schemas-2.91.92 - doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.7 )" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=app-text/gnome-doc-utils-0.3.2 - >=dev-util/intltool-0.40.6 - sys-devel/gettext - x11-proto/xproto - >=x11-proto/randrproto-1.2 - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.4 )" - -# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto -# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and -# eventually libXrandr shouldn't RDEPEND on randrproto) - -pkg_setup() { - DOCS="AUTHORS ChangeLog HACKING NEWS README" - # Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids - # file (needed by other packages such as >=gnome-settings-daemon-3.1.2) - # will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0). - G2CONF="${G2CONF} - --disable-scrollkeeper - --disable-static - --with-gnome-distributor=Gentoo - $(use_enable doc desktop-docs) - $(use_enable introspection)" -} diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest deleted file mode 100644 index 28a3b77..0000000 --- a/gnome-base/gnome-menus/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX 10-xdg-menu-gnome-r1 159 RMD160 a0e1372c398b06fb6d6590acaf8e6155f2858a4b SHA1 86b702d6926a5c3588a457f2c8c40532b1255210 SHA256 8c1f628109ed791e00857f5808dbe1d35a15575a2b36cbb764c3ea14d1ea0378 -AUX gnome-menus-3.0.0-ignore_kde_standalone.patch 1222 RMD160 39b97747a5b87c8bc217082268fa825e767cf528 SHA1 0d9cf9fae2224a3a42ef93ca51105fa8b33f0a42 SHA256 b11842a88d41ad29ae825020432516d613d456a8f57c19ed32921a1cb4ca14fe -DIST gnome-menus-3.5.2.tar.xz 419244 RMD160 026ff562a88a8c4d2939c516056161ac7acdc391 SHA1 869f8e4703c8cb60a9eb81e15e309a8218ff1b21 SHA256 43c7615d4aa9644c8d29accfc65202f178656025e69f2da510851a2d4b85d6a5 -EBUILD gnome-menus-3.5.2.ebuild 3066 RMD160 8387c4e013c30f64ee622ba4be01e41135a527b1 SHA1 a9ffbafd0fac3fe9e68d94a30c761513a6a92e96 SHA256 118e67c8146a8d21e8c1d2728b9d26bd502a6e9733d0b437fc6cff3e93c5799f diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 b/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 deleted file mode 100644 index 4bbf863..0000000 --- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ -z "$XDG_MENU_PREFIX" ] && { [ "$DESKTOP_SESSION" = "gnome" ] || [ "$DESKTOP_SESSION" = "cinnamon" ]; } -then - export XDG_MENU_PREFIX=gnome- -fi diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch deleted file mode 100644 index 5f5f8b2..0000000 --- a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- layout/applications.menu.orig 2007-09-21 17:51:43.000000000 +0300 -+++ layout/applications.menu 2007-09-21 17:55:38.000000000 +0300 -@@ -146,6 +146,19 @@ - <Not><Category>Core</Category></Not> - <Not><Category>Screensaver</Category></Not> - <Not><Category>X-GNOME-Settings-Panel</Category></Not> -+ <Not><Category>X-KDE-settings-accessibility</Category></Not> -+ <Not><Category>X-KDE-settings-components</Category></Not> -+ <Not><Category>X-KDE-settings-desktop</Category></Not> -+ <Not><Category>X-KDE-settings-looknfeel</Category></Not> -+ <Not><Category>X-KDE-settings-network</Category></Not> -+ <Not><Category>X-KDE-settings-webbrowsing</Category></Not> -+ <Not><Category>X-KDE-settings-peripherals</Category></Not> -+ <Not><Category>X-KDE-settings-hardware</Category></Not> -+ <Not><Category>X-KDE-settings-power</Category></Not> -+ <Not><Category>X-KDE-settings-security</Category></Not> -+ <Not><Category>X-KDE-settings-sound</Category></Not> -+ <Not><Category>X-KDE-settings-system</Category></Not> -+ <Not><Category>X-KDE-information</Category></Not> - </And> - </Include> - </Menu> <!-- End Other --> diff --git a/gnome-base/gnome-menus/gnome-menus-3.5.2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.5.2.ebuild deleted file mode 100644 index 5761479..0000000 --- a/gnome-base/gnome-menus/gnome-menus-3.5.2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.4.2.ebuild,v 1.1 2012/05/20 09:47:16 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -PYTHON_DEPEND="2:2.5" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit eutils gnome2 python - -DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec" -HOMEPAGE="http://www.gnome.org" - -LICENSE="GPL-2 LGPL-2" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" - -# +python for gmenu-simple-editor -IUSE="debug +introspection +python test" - -COMMON_DEPEND=">=dev-libs/glib-2.29.15:2 - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - python? ( - >=dev-libs/gobject-introspection-0.9.5 - dev-python/pygobject:3 - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/gtk+:3[introspection] )" -# Older versions of slot 0 install the menu editor and the desktop directories -RDEPEND="${COMMON_DEPEND} - !<gnome-base/gnome-menus-3.0.1-r1:0" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext - virtual/pkgconfig - >=dev-util/intltool-0.40 - test? ( dev-libs/gjs )" - -pkg_setup() { - use python && python_pkg_setup - DOCS="AUTHORS ChangeLog HACKING NEWS README" - - # Do NOT compile with --disable-debug/--enable-debug=no - # It disables api usage checks - if ! use debug ; then - G2CONF="${G2CONF} --enable-debug=minimum" - fi - - if use python || use introspection; then - use introspection || ewarn "Enabling introspection due to USE=python" - G2CONF="${G2CONF} --enable-introspection" - else - G2CONF="${G2CONF} --disable-introspection" - fi - - G2CONF="${G2CONF} --disable-static" -} - -src_prepare() { - gnome2_src_prepare - - # Don't show KDE standalone settings desktop files in GNOME others menu - epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch" - - if use python; then - python_clean_py-compile_files - python_copy_sources - else - sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \ - -i Makefile.* || die "sed failed" - fi -} - -src_configure() { - if use python; then - python_execute_function -s gnome2_src_configure - else - gnome2_src_configure - fi -} - -src_compile() { - if use python; then - python_execute_function -s gnome2_src_compile - else - gnome2_src_compile - fi -} - -src_test() { - if use python; then - python_execute_function -s -d - else - default - fi -} - -src_install() { - if use python; then - python_execute_function -s gnome2_src_install - python_clean_installation_image - else - gnome2_src_install - fi - - # Prefix menu, bug #256614 - mv "${ED}"/etc/xdg/menus/applications.menu \ - "${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed" - - exeinto /etc/X11/xinit/xinitrc.d/ - newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome -} - -pkg_postinst() { - gnome2_pkg_postinst - if use python; then - python_mod_optimize GMenuSimpleEditor - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - if use python; then - python_mod_cleanup GMenuSimpleEditor - fi -} diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest deleted file mode 100644 index b7fae39..0000000 --- a/gnome-base/gsettings-desktop-schemas/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gsettings-desktop-schemas-3.5.2.tar.xz 228744 RMD160 4fc615fff398f9007e20cb7b5e0121ab83946982 SHA1 b639324257fdc143e3dcc358bfe2f3ff3bb50428 SHA256 a08feef26e8adb9dc3e4a830fe5d1f7f6007c4578fc11a8c16c7f96d1c2678f5 -EBUILD gsettings-desktop-schemas-3.5.2.ebuild 892 RMD160 625b6d885c864e0d1f79fc2defe50c66d1d6c450 SHA1 2fafb5f1ba9260e2d8bd3ce1e5f5a43f0b0b537f SHA256 77ba185cfc4a416c075bdbf6c079de24d44ba61295e49326e2bf91d13fdcca0b diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.5.2.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.5.2.ebuild deleted file mode 100644 index 7de9a64..0000000 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.5.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.4.2.ebuild,v 1.2 2012/05/28 12:34:25 blueness Exp $ - -EAPI="4" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Collection of GSettings schemas for GNOME desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+introspection" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=">=dev-libs/glib-2.31:2 - introspection? ( >=dev-libs/gobject-introspection-1.31.0 )" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.40 - virtual/pkgconfig" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable introspection)" - DOCS="AUTHORS HACKING NEWS README" -} diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest deleted file mode 100644 index 572bf9d..0000000 --- a/gnome-base/gvfs/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519 -AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062 -DIST gvfs-1.13.1.tar.xz 1377080 RMD160 824d75eb94d350e589bea9a970d21f356f978112 SHA1 efb76e7c783d3e8b7070ac1e5dd1b03118344f70 SHA256 97b69d8f13a1996ecd347bad12368dd8f660676d4027e8ef779585e7dd2b5981 -DIST libgcrypt.m4.bz2 1526 RMD160 6149f51c00e1e21d85187136f7682e41271fed40 SHA1 1731ae882cdc7c53efeef2e23e0d2d9791c6d739 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128 -EBUILD gvfs-1.13.1.ebuild 3430 RMD160 2ec93d14c2f1b09391a010ddbf6dee671213f95c SHA1 5c27fe507fc3ba13327baa6b79b739394699ab3b SHA256 4c7a0d9443adbb2c2b53398643784d35e51c61719c1e37755e92a3b2484a3695 diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch b/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch deleted file mode 100644 index 86222e5..0000000 --- a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=567235 (Fedora) -Our bug: http://bugs.gentoo.org/show_bug.cgi?id=249829 ----- -Index: mount-archive.desktop.in.in -=================================================================== ---- mount-archive.desktop.in.in (revision 0) -+++ mount-archive.desktop.in.in (revision 0) -@@ -0,0 +1,14 @@ -+[Desktop Entry] -+Encoding=UTF-8 -+_Name=Archive Mounter -+Exec=@libexecdir@/gvfsd-archive file=%u -+X-Gnome-Vfs-System=gio -+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar; -+Terminal=false -+StartupNotify=false -+Type=Application -+NoDisplay=true -+X-GNOME-Bugzilla-Bugzilla=GNOME -+X-GNOME-Bugzilla-Product=gvfs -+X-GNOME-Bugzilla-Component=archive-backend -+X-GNOME-Bugzilla-Version=@VERSION@ -Index: Makefile.am -=================================================================== ---- Makefile.am.orig 2008-07-22 15:35:49.000000000 +0200 -+++ Makefile.am 2008-07-22 17:56:59.417180064 +0200 -@@ -1,5 +1,20 @@ - NULL = - -+@INTLTOOL_DESKTOP_RULE@ -+ -+desktop_in_files = mount-archive.desktop.in -+ -+mount-archive.desktop.in: mount-archive.desktop.in.in -+ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -+ -+desktopdir = $(datadir)/applications -+if HAVE_ARCHIVE -+desktop_DATA = mount-archive.desktop -+else -+desktop_DATA = -+endif -+ -+ - SUBDIRS = \ - common \ - client \ -@@ -15,6 +30,8 @@ - - EXTRA_DIST = \ - MAINTAINERS \ -+ mount-archive.desktop.in.in \ -+ $(desktop_in_files) \ - $(NULL) - - DISTCLEANFILES = \ diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch deleted file mode 100644 index 78fecb7..0000000 --- a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch +++ /dev/null @@ -1,28 +0,0 @@ -Gentoo bug 264941 -Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=578027 ---- -diff -urNp gvfs-1.2.2/configure.ac gvfs-1.2.2-new/configure.ac ---- gvfs-1.2.2/configure.ac 2009-04-03 13:00:54.000000000 +0530 -+++ gvfs-1.2.2-new/configure.ac 2009-05-04 22:53:24.000000000 +0530 -@@ -307,12 +307,20 @@ if test "x$enable_gphoto2" != "xno" -a " - ;; - esac - -+ if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then -+ AC_MSG_ERROR([gphoto2 support requested but not available]) -+ fi -+ - if test "x$msg_gphoto2" = "xyes"; then - if test "x$use_gphoto2" = "xyes"; then - PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0) - AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available]) - else -- AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.]) -+ if test "x$enable_gphoto2" = "xyes"; then -+ AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.]) -+ else -+ AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.]) -+ fi - msg_gphoto2=no - fi - fi diff --git a/gnome-base/gvfs/gvfs-1.13.1.ebuild b/gnome-base/gvfs/gvfs-1.13.1.ebuild deleted file mode 100644 index 2193c9e..0000000 --- a/gnome-base/gvfs/gvfs-1.13.1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3.ebuild,v 1.2 2012/05/29 16:19:05 aballier Exp $ - -EAPI=4 -GCONF_DEBUG=no -GNOME2_LA_PUNT=yes - -inherit autotools bash-completion-r1 eutils gnome2 - -[[ ${PV} = 9999 ]] && inherit gnome2-live - -DESCRIPTION="GNOME Virtual Filesystem Layer" -HOMEPAGE="http://www.gnome.org" - -LICENSE="LGPL-2" -SLOT="0" - -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" - DOCS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits -fi - -SRC_URI="${SRC_URI} - http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2" - -IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks" - -RDEPEND=">=dev-libs/glib-2.31.0:2 - sys-apps/dbus - dev-libs/libxml2 - net-misc/openssh - afp? ( >=dev-libs/libgcrypt-1.2.2 ) - archive? ( app-arch/libarchive ) - avahi? ( >=net-dns/avahi-0.6 ) - bluetooth? ( - >=app-mobilephone/obex-data-server-0.4.5 - dev-libs/dbus-glib - net-wireless/bluez - dev-libs/expat ) - bluray? ( media-libs/libbluray ) - fuse? ( >=sys-fs/fuse-2.8.0 ) - gdu? ( || ( - >=gnome-base/libgdu-3.0.2 - =sys-apps/gnome-disk-utility-3.0.2-r300 - =sys-apps/gnome-disk-utility-3.0.2-r200 ) ) - gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 ) - gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) - ios? ( - >=app-pda/libimobiledevice-1.1.0 - >=app-pda/libplist-1 ) - udev? ( - cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) - || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) ) - udisks? ( >=sys-fs/udisks-1.90:2 ) - http? ( >=net-libs/libsoup-gnome-2.26.0 ) - samba? ( >=net-fs/samba-3.4.6[smbclient] )" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - virtual/pkgconfig - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1 )" - -REQUIRED_USE="cdda? ( udev )" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-bash-completion - --disable-hal - --disable-schemas-compile - --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services - $(use_enable afp) - $(use_enable archive) - $(use_enable avahi) - $(use_enable bluetooth obexftp) - $(use_enable bluray) - $(use_enable cdda) - $(use_enable fuse) - $(use_enable gdu) - $(use_enable gphoto2) - $(use_enable ios afc) - $(use_enable udev) - $(use_enable udev gudev) - $(use_enable http) - $(use_enable gnome-keyring keyring) - $(use_enable samba) - $(use_enable udisks udisks2)" -} - -src_prepare() { - # Conditional patching purely to avoid eautoreconf -# use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch - - if use archive; then - epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch - echo mount-archive.desktop.in >> po/POTFILES.in - echo mount-archive.desktop.in.in >> po/POTFILES.in - fi - - if ! use udev; then - sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die - sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die - sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die - fi - - if use gphoto2 || use archive || ! use udev; then - # libgcrypt.m4 needed for eautoreconf, bug #399043 - mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die - - AT_M4DIR=. eautoreconf - fi - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - newbashcomp programs/gvfs-bash-completion.sh ${PN} -} |