From 6e40f385d8897160393abcefaa5a364e6b246806 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 13 Nov 2014 18:09:37 +0300 Subject: [PATCH] Sync with portage [Thu Nov 13 18:09:36 MSK 2014]. --- app-accessibility/dasher/Manifest | 1 - app-accessibility/dasher/dasher-4.11.ebuild | 73 - app-accessibility/dasher/metadata.xml | 15 - app-accessibility/java-access-bridge/Manifest | 1 - ...a-access-bridge-1.6.0-missingclasses.patch | 48 - .../java-access-bridge-1.26.2.ebuild | 76 - .../java-access-bridge/metadata.xml | 6 - app-accessibility/morseall/Manifest | 1 - app-accessibility/morseall/metadata.xml | 5 - .../morseall/morseall-0.5.0.ebuild | 22 - .../system-config-printer-common/Manifest | 2 - ...m-config-printer-common-1.3.12-split.patch | 177 --- ...m-config-printer-common-1.3.13-split.patch | 178 --- ...system-config-printer-common-1.3.12.ebuild | 91 -- ...system-config-printer-common-1.3.13.ebuild | 87 -- .../system-config-printer-gnome/Manifest | 2 - ...em-config-printer-gnome-1.3.12-split.patch | 183 --- ...em-config-printer-gnome-1.3.13-split.patch | 182 --- .../system-config-printer-gnome-1.3.12.ebuild | 89 -- .../system-config-printer-gnome-1.3.13.ebuild | 90 -- app-dicts/verbiste/verbiste-0.1.38.ebuild | 72 - .../emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild | 367 ----- .../emacs-vcs-25.0.50_pre20141031.ebuild | 4 +- .../emacs-vcs-25.0.50_pre20141110.ebuild | 4 +- .../emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild | 4 +- .../emacs-vcs/emacs-vcs-25.0.9999.ebuild | 367 ----- app-i18n/im-ja/im-ja-1.5-r2.ebuild | 92 -- app-i18n/uim/Manifest | 5 - app-i18n/uim/files/50uim-gentoo.el | 4 - app-i18n/uim/files/uim-1.7.3-glib-2.32.patch | 21 - app-i18n/uim/files/uim-1.7.3-linguas.patch | 9 - app-i18n/uim/files/uim-1.8.0-glib2.32.patch | 12 - app-i18n/uim/uim-1.7.3-r1.ebuild | 251 ---- app-i18n/uim/uim-1.7.3.ebuild | 242 ---- app-i18n/uim/uim-1.8.0-r1.ebuild | 248 ---- app-i18n/uim/uim-1.8.0.ebuild | 239 ---- app-i18n/uim/uim-1.8.2-r1.ebuild | 247 ---- app-i18n/uim/uim-1.8.2.ebuild | 238 --- app-i18n/uim/uim-1.8.3-r1.ebuild | 247 ---- app-i18n/uim/uim-1.8.3.ebuild | 238 --- app-i18n/uim/uim-1.8.4-r1.ebuild | 247 ---- app-i18n/uim/uim-1.8.4.ebuild | 238 --- app-i18n/uim/uim-1.8.6.ebuild | 242 ---- dev-dotnet/gtkhtml-sharp/Manifest | 1 - .../gtkhtml-sharp/gtkhtml-sharp-2.26.0.ebuild | 15 - dev-dotnet/gtkhtml-sharp/metadata.xml | 5 - dev-libs/libgdata/Manifest | 2 - .../files/libgdata-0.8.1-empty-names.patch | 102 -- .../files/libgdata-0.8.1-gdata-symbols.patch | 33 - .../files/libgdata-0.8.1-validate-ssl.patch | 53 - dev-libs/libgdata/libgdata-0.16.0.ebuild | 68 - dev-libs/libgdata/libgdata-0.8.1-r2.ebuild | 75 - dev-libs/libgweather/Manifest | 1 - ...-2.30.0-fix-automagic-python-support.patch | 24 - .../libgweather/libgweather-2.30.3.ebuild | 65 - dev-python/brasero-python/Manifest | 1 - .../brasero-python-2.32.0-r1.ebuild | 24 - .../brasero-python-2.32.0.ebuild | 26 - dev-python/brasero-python/metadata.xml | 5 - dev-python/bug-buddy-python/Manifest | 1 - .../bug-buddy-python-2.32.0-r1.ebuild | 21 - .../bug-buddy-python-2.32.0.ebuild | 22 - dev-python/bug-buddy-python/metadata.xml | 5 - dev-python/evince-python/Manifest | 1 - .../evince-python-2.32.0-r1.ebuild | 21 - .../evince-python/evince-python-2.32.0.ebuild | 22 - dev-python/evince-python/metadata.xml | 8 - dev-python/evolution-python/Manifest | 1 - .../evolution-python-2.32.0-r1.ebuild | 22 - .../evolution-python-2.32.0.ebuild | 24 - dev-python/evolution-python/metadata.xml | 5 - dev-python/gnome-applets-python/Manifest | 1 - ...e-applets-python-2.26.0-session-mgmt.patch | 28 - .../gnome-applets-python-2.32.0-r1.ebuild | 26 - .../gnome-applets-python-2.32.0.ebuild | 28 - dev-python/gnome-applets-python/metadata.xml | 5 - dev-python/gnome-desktop-python/Manifest | 1 - .../gnome-desktop-python-2.32.0-r1.ebuild | 22 - .../gnome-desktop-python-2.32.0.ebuild | 24 - dev-python/gnome-desktop-python/metadata.xml | 5 - dev-python/gnome-media-python/Manifest | 1 - .../gnome-media-python-2.32.0-r1.ebuild | 26 - .../gnome-media-python-2.32.0.ebuild | 28 - dev-python/gnome-media-python/metadata.xml | 5 - dev-python/gns3-gui/Manifest | 1 + dev-python/gns3-gui/gns3-gui-1.1.ebuild | 47 + dev-python/gns3-gui/metadata.xml | 12 + dev-python/libgda-python/Manifest | 1 - .../libgda-python-2.25.3-python-libs.patch | 59 - .../libgda-python-2.25.3-r1.ebuild | 30 - .../libgda-python/libgda-python-2.25.3.ebuild | 35 - dev-python/libgda-python/metadata.xml | 6 - dev-python/libgksu-python/Manifest | 1 - .../libgksu-python-2.25.3-python-libs.patch | 59 - .../libgksu-python-2.25.3-r1.ebuild | 33 - .../libgksu-python-2.25.3.ebuild | 38 - dev-python/libgksu-python/metadata.xml | 6 - dev-python/libgnomeprint-python/Manifest | 1 - .../libgnomeprint-python-2.32.0-r1.ebuild | 25 - .../libgnomeprint-python-2.32.0.ebuild | 27 - dev-python/libgnomeprint-python/metadata.xml | 5 - dev-python/libgtop-python/Manifest | 1 - .../libgtop-python-2.32.0-r1.ebuild | 21 - .../libgtop-python-2.32.0.ebuild | 23 - dev-python/libgtop-python/metadata.xml | 5 - dev-python/nautilus-python/Manifest | 1 - .../nautilus-python-0.7.3.ebuild | 48 - dev-python/totem-python/Manifest | 1 - dev-python/totem-python/metadata.xml | 5 - .../totem-python-2.32.0-r1.ebuild | 22 - .../totem-python/totem-python-2.32.0.ebuild | 24 - dev-util/mono-tools/Manifest | 1 - .../files/mono-tools-2.10-autoconf.patch | 78 - .../mono-tools-2.8-html-renderer-fixes.patch | 111 -- dev-util/mono-tools/metadata.xml | 5 - dev-util/mono-tools/mono-tools-2.10.ebuild | 56 - dev-vcs/bzr-gtk/Manifest | 1 - dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild | 55 - dev-vcs/bzr-gtk/metadata.xml | 2 - dev-vcs/giggle/Manifest | 1 - .../files/giggle-0.6.1-gmodule-explicit.patch | 23 - dev-vcs/giggle/giggle-0.6.2.ebuild | 39 - dev-vcs/giggle/giggle-0.7.ebuild | 39 - gnome-base/gconf/Manifest | 1 - gnome-base/gconf/gconf-2.32.4-r1.ebuild | 100 -- gnome-base/gconf/gconf-3.2.6-r1.ebuild | 117 -- gnome-base/gconf/gconf-3.2.6-r2.ebuild | 114 -- gnome-base/gconf/metadata.xml | 2 - gnome-base/gdm/Manifest | 3 - gnome-base/gdm/files/49-keychain | 9 - gnome-base/gdm/files/50-ssh-agent | 10 - .../gdm-2.13.0.1-selinux-remove-attr.patch | 24 - .../files/gdm-2.20.10-custom-session.patch | 42 - ...20.10-desktop-session-dmrc-autologin.patch | 34 - .../gdm-2.20.10-gdmsetup-24hr-combo.patch | 22 - .../files/gdm-2.20.10-xinitrc-ssh-agent.patch | 26 - .../gdm/files/gdm-2.20.11-underlinking.patch | 59 - gnome-base/gdm/files/gdm-2.20.2-gksu.patch | 12 - .../gdm/files/gdm-2.20.9-parallel-make.patch | 42 - gnome-base/gdm/gdm-2.20.11-r1.ebuild | 254 ---- gnome-base/gdm/metadata.xml | 4 - gnome-base/gnome-applets/Manifest | 1 - .../gnome-applets-2.32.1.1-dbus-fix.patch | 28 - ...gnome-applets-2.32.1.1-libnotify-0.7.patch | 53 - .../gnome-applets-2.32.1.1-mixer-libm.patch | 26 - .../gnome-applets-2.32.1.1-underlinking.patch | 117 -- .../gnome-applets-2.32.1.1-r2.ebuild | 141 -- gnome-base/gnome-applets/metadata.xml | 8 - gnome-base/gnome-control-center/Manifest | 1 - ...-center-2.32.1-duplicated-background.patch | 115 -- ...ntrol-center-2.32.1-erase-background.patch | 46 - .../gnome-control-center-2.32.1-gmodule.patch | 41 - ...e-control-center-2.32.1-mime-handler.patch | 1274 ----------------- ...-control-center-2.32.1-mime-handler2.patch | 56 - ...-control-center-2.32.1-mime-handler3.patch | 290 ---- ...gnome-control-center-3.12.1-optional.patch | 383 ----- .../gnome-control-center-2.32.1-r1.ebuild | 110 -- gnome-base/gnome-fallback/Manifest | 0 .../gnome-fallback-3.6.2.ebuild | 29 - .../gnome-fallback-3.8.0.ebuild | 31 - gnome-base/gnome-fallback/metadata.xml | 5 - gnome-base/gnome-keyring/Manifest | 3 - .../gnome-keyring-2.32.1-fix-undefined.patch | 26 - .../gnome-keyring-2.32.1-glib-2.32.patch | 56 - .../gnome-keyring-2.32.1-r1.ebuild | 74 - .../gnome-keyring/gnome-keyring-3.10.1.ebuild | 80 -- .../gnome-keyring/gnome-keyring-3.12.0.ebuild | 85 -- .../gnome-keyring/gnome-keyring-3.12.2.ebuild | 84 -- .../gnome-light/gnome-light-2.32.1-r2.ebuild | 86 -- .../gnome-light/gnome-light-3.10.0.ebuild | 51 - gnome-base/gnome-light/metadata.xml | 2 - gnome-base/gnome-menus/Manifest | 2 - .../gnome-menus/files/10-xdg-menu-gnome | 6 - .../gnome-menus/files/10-xdg-menu-gnome-r1 | 6 - ...e-menus-2.18.3-ignore_kde_standalone.patch | 22 - ...me-menus-3.0.0-ignore_kde_standalone.patch | 22 - ...nome-menus-3.0.1-applications-merged.patch | 100 -- .../gnome-menus-3.0.2-library-only.patch | 26 - ...ont-use-OnlyUnallocated-for-sections.patch | 303 ---- .../gnome-menus-3.8.0-gnome-calculator.patch | 41 - .../gnome-menus/gnome-menus-2.30.5-r1.ebuild | 102 -- .../gnome-menus/gnome-menus-3.0.1-r2.ebuild | 92 -- .../gnome-menus/gnome-menus-3.10.1.ebuild | 51 - gnome-base/gnome-panel/Manifest | 4 - .../files/gnome-panel-2.32.1-as-needed.patch | 35 - .../files/gnome-panel-2.32.1-evo-month.patch | 23 - .../gnome-panel-2.32.1-fix-multiscreen.patch | 161 --- .../gnome-panel-2.32.1-fix-multiscreen2.patch | 40 - .../files/gnome-panel-2.32.1-gmodule.patch | 13 - .../gnome-panel-2.32.1-underlinking.patch | 42 - .../gnome-panel-3.6.2-drop-commandline.patch | 48 - .../gnome-panel-3.6.2-fix-animation.patch | 31 - .../files/gnome-panel-3.6.2-fix-black.patch | 43 - ...gnome-panel-3.6.2-generic-marshaller.patch | 135 -- .../gnome-panel-3.6.2-gweather-include.patch | 25 - .../gnome-panel-3.6.2-rename-function.patch | 65 - ...gnome-panel-3.6.2-resurrect-function.patch | 172 --- .../gnome-panel/gnome-panel-2.32.1-r3.ebuild | 124 -- .../gnome-panel/gnome-panel-3.8.0-r1.ebuild | 77 - gnome-base/gnome-panel/metadata.xml | 9 - gnome-base/gnome-session/Manifest | 1 - .../files/10-user-dirs-update-gnome | 10 - .../gnome-session/files/15-xdg-data-gnome | 9 - gnome-base/gnome-session/files/defaults.list | 333 ----- ...session-2.32.0-session-saving-button.patch | 559 -------- .../gnome-session-2.32.1-dialog-size.patch | 21 - .../gnome-session-2.32.1-dialog-size2.patch | 25 - ...ome-session-2.32.1-gnome3-conditions.patch | 107 -- ...-session-2.32.1-gsettings-conditions.patch | 135 -- ...gnome-session-2.32.1-idle-transition.patch | 37 - .../gnome-session-3.8.4-blacklist-nv25.patch | 22 - .../gnome-session-3.8.4-presence-crash.patch | 48 - .../gnome-session-2.32.1-r3.ebuild | 104 -- gnome-base/gnome-settings-daemon/Manifest | 2 - ...ome-settings-daemon-2.32.1-lcdfilter.patch | 34 - ...settings-daemon-2.32.1-libnotify-0.7.patch | 76 - ...ettings-daemon-2.32.1-libnotify-init.patch | 14 - ...tings-daemon-2.32.1-media-keys-react.patch | 43 - ...settings-daemon-2.32.1-netfs-monitor.patch | 58 - ...ettings-daemon-2.32.1-syndaemon-mode.patch | 42 - .../gnome-settings-daemon-2.32.1-r2.ebuild | 123 -- gnome-base/gnome/gnome-2.32.1-r2.ebuild | 191 --- gnome-base/gnome/gnome-3.10.0.ebuild | 88 -- gnome-base/libgnome-keyring/Manifest | 1 - .../libgnome-keyring-2.32.0-drop-test.patch | 122 -- .../libgnome-keyring-2.32.0-hang-tests.patch | 21 - .../libgnome-keyring-2.32.0-run-test.patch | 87 -- .../libgnome-keyring-2.32.0.ebuild | 61 - gnome-base/libgnomekbd/Manifest | 1 - .../libgnomekbd-2.32.0-gdkdisplay-usage.patch | 61 - ...ibgnomekbd-2.32.0-gdkkeyname-replace.patch | 231 --- .../libgnomekbd-2.32.0-unneeded-casts.patch | 41 - .../libgnomekbd/libgnomekbd-2.32.0-r1.ebuild | 45 - gnome-base/nautilus/Manifest | 4 - .../nautilus-2.32.2.1-gold-glib2.32.patch | 13 - .../nautilus/nautilus-2.32.2.1-r2.ebuild | 84 -- gnome-base/nautilus/nautilus-3.10.1.ebuild | 128 -- gnome-base/nautilus/nautilus-3.12.0.ebuild | 128 -- gnome-extra/at-spi/Manifest | 1 - gnome-extra/at-spi/at-spi-1.32.0-r2.ebuild | 74 - gnome-extra/at-spi/at-spi-2.8.0.ebuild | 22 - .../at-spi/files/at-spi-1.22.0-tests.patch | 80 -- .../at-spi/files/at-spi-1.30.1-make-382.patch | 21 - gnome-extra/bug-buddy/Manifest | 1 - .../bug-buddy/bug-buddy-2.32.0-r2.ebuild | 55 - .../bug-buddy-2.32.0-gnomesession-debug.patch | 27 - gnome-extra/bug-buddy/metadata.xml | 5 - .../cinnamon/cinnamon-2.2.16-r1.ebuild | 233 --- gnome-extra/deskbar-applet/Manifest | 1 - .../deskbar-applet-2.32.0.ebuild | 96 -- .../deskbar-applet-2.32.0-glib-2.32.patch | 21 - gnome-extra/deskbar-applet/metadata.xml | 11 - gnome-extra/evolution-data-server/Manifest | 3 - .../evolution-data-server-2.32.3-r3.ebuild | 170 --- .../evolution-data-server-3.12.7.1.ebuild | 129 -- .../files/e-d-s-camel-skip-failing-test.patch | 22 - ...data-server-2.31-gentoo_etc_services.patch | 40 - ...ion-data-server-2.32.3-g_thread_init.patch | 149 -- ...-data-server-2.32.3-gmodule-explicit.patch | 52 - ...olution-data-server-2.32.3-imap-move.patch | 62 - ...tion-data-server-2.32.3-libical-0.48.patch | 37 - ...ution-data-server-2.32.3-libxml2-2.9.patch | 121 -- .../files/fix_relink_command.pl | 108 -- gnome-extra/evolution-exchange/Manifest | 1 - .../evolution-exchange-2.32.3.ebuild | 57 - gnome-extra/evolution-exchange/metadata.xml | 5 - gnome-extra/evolution-webcal/Manifest | 1 - .../evolution-webcal-2.32.0.ebuild | 32 - ...volution-webcal-2.32.0-g_thread_init.patch | 30 - gnome-extra/evolution-webcal/metadata.xml | 5 - gnome-extra/fast-user-switch-applet/Manifest | 1 - .../fast-user-switch-applet-2.24.0.ebuild | 49 - ...user-switch-applet-2.24.0-libgnomeui.patch | 13 - .../fast-user-switch-applet/metadata.xml | 6 - gnome-extra/file-browser-applet/Manifest | 1 - .../file-browser-applet-0.6.7.ebuild | 42 - gnome-extra/file-browser-applet/metadata.xml | 10 - gnome-extra/gcalctool/Manifest | 2 - .../gcalctool-5.32.2-missing-header.patch | 10 - gnome-extra/gcalctool/gcalctool-5.32.2.ebuild | 44 - gnome-extra/gcalctool/gcalctool-6.6.2.ebuild | 37 - gnome-extra/gcalctool/metadata.xml | 5 - gnome-extra/gconf-editor/Manifest | 1 - .../gconf-editor/gconf-editor-2.32.0.ebuild | 33 - gnome-extra/gnome-audio/Manifest | 1 - .../gnome-audio/gnome-audio-2.22.2.ebuild | 27 - gnome-extra/gnome-audio/metadata.xml | 5 - gnome-extra/gnome-color-manager/Manifest | 2 - ...e-color-manager-2.32.0-libnotify-0.7.patch | 27 - .../gnome-color-manager-2.32.0.ebuild | 54 - .../gnome-color-manager-3.10.1.ebuild | 73 - gnome-extra/gnome-color-manager/metadata.xml | 2 - gnome-extra/gnome-games-extra-data/Manifest | 2 - .../gnome-games-extra-data-2.26.0.ebuild | 16 - .../gnome-games-extra-data-2.30.0.ebuild | 16 - .../gnome-games-extra-data/metadata.xml | 5 - gnome-extra/gnome-games/Manifest | 1 - ...e-games-2.26.3-gtali-invalid-pointer.patch | 26 - ...me-games-2.26.3-implicit-declaration.patch | 11 - ...1-conflicting-types-libgames-support.patch | 33 - .../files/gnome-games-2.28.2-automake.patch | 15 - .../gnome-games-2.28.2-underlinking.patch | 52 - .../files/gnome-games-2.28.2-zlib.patch | 60 - ...-2.91.90-fix-conditional-ac-prog-cxx.patch | 30 - .../files/gnome-games-fix-staging-games.patch | 44 - .../gnome-games/gnome-games-2.28.2.ebuild | 201 --- gnome-extra/gnome-games/metadata.xml | 8 - gnome-extra/gnome-hdaps-applet/Manifest | 1 - ...s-applet-20081204-include-and-unused.patch | 20 - .../gnome-hdaps-applet-20081204.ebuild | 49 - gnome-extra/gnome-hdaps-applet/metadata.xml | 9 - gnome-extra/gnome-media/Manifest | 2 - .../files/gnome-media-2.30.0-lamemp3enc.patch | 26 - .../gnome-media-2.30.0-microphone-icon.patch | 27 - ...sable-gnome-audio-profile-properties.patch | 42 - .../gnome-media-2.32.0-gvc-channel.patch | 12 - .../gnome-media/gnome-media-2.32.0-r1.ebuild | 84 -- .../gnome-media-2.32.0-r300.ebuild | 81 -- .../gnome-media/gnome-media-3.4.0.ebuild | 73 - gnome-extra/gnome-media/metadata.xml | 9 - gnome-extra/gnome-power-manager/Manifest | 2 - .../gnome-power-manager-2.32.0-close-fd.patch | 25 - ...er-manager-2.32.0-convert-percentage.patch | 31 - ...er-manager-2.32.0-duplicated-battery.patch | 20 - ...e-power-manager-2.32.0-libnotify-0.7.patch | 30 - .../gnome-power-manager-2.32.0-no-xfce.patch | 38 - ...ower-manager-2.32.0-xbacklight-crash.patch | 21 - .../gnome-power-manager-2.32.0-r3.ebuild | 128 -- gnome-extra/gnome-power-manager/metadata.xml | 3 - gnome-extra/gnome-screensaver/Manifest | 3 - .../files/gentoologo-floaters.desktop | 12 - ...ome-screensaver-2.30.2-libnotify-0.7.patch | 25 - ...ensaver-2.30.2-libxklavier-configure.patch | 22 - ...nome-screensaver-2.30.2-name-manager.patch | 203 --- ...gnome-screensaver-2.30.2-nvidia-fade.patch | 44 - ...nome-screensaver-2.30.2-nvidia-fade2.patch | 65 - ...screensaver-2.30.2-popsquares-header.patch | 13 - ...ome-screensaver-2.30.2-prevent-twice.patch | 64 - .../files/xss-conversion-2.txt | 22 - .../gnome-screensaver-2.30.2-r1.ebuild | 146 -- .../gnome-screensaver-3.6.1.ebuild | 76 - gnome-extra/gnome-screensaver/metadata.xml | 13 - gnome-extra/gnome-swallow/Manifest | 1 - .../files/gnome-swallow-1.2-as-needed.patch | 48 - .../gnome-swallow-1.2-libgnomeui-flags.patch | 39 - .../files/gnome-swallow-1.2-qa-warning.patch | 19 - .../gnome-swallow/gnome-swallow-1.2.ebuild | 43 - gnome-extra/gnome-swallow/metadata.xml | 5 - gnome-extra/gnome-system-monitor/Manifest | 3 - .../gnome-system-monitor-2.28.2-gmodule.patch | 13 - ...tem-monitor-3.8.2.1-fix-grid-display.patch | 46 - .../gnome-system-monitor-2.28.2-r1.ebuild | 53 - .../gnome-system-monitor-3.10.2.ebuild | 44 - gnome-extra/gnome-user-docs/Manifest | 2 - .../gnome-user-docs-2.32.0.ebuild | 29 - .../gnome-user-docs-3.10.3.ebuild | 43 - gnome-extra/gnome-user-share/Manifest | 1 - ...nome-user-share-2.30.1-libnotify-0.7.patch | 31 - .../gnome-user-share-2.30.1.ebuild | 59 - gnome-extra/gnome-utils/Manifest | 2 - ...gnome-utils-2.32.0-fix-uninitialized.patch | 30 - .../files/gnome-utils-2.32.0-new-icons.patch | 169 --- .../files/gnome-utils-2.32.0-new-icons2.patch | 22 - .../gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch | 62 - .../gnome-utils/gnome-utils-2.32.0-r2.ebuild | 85 -- gnome-extra/gnome-utils/metadata.xml | 4 - gnome-extra/gtkhtml/Manifest | 2 - .../files/gtkhtml-3.32.2-g_thread_init.patch | 25 - gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild | 61 - gnome-extra/gtkhtml/gtkhtml-4.8.4.ebuild | 44 - gnome-extra/hamster-applet/Manifest | 1 - .../hamster-applet-2.32.1-fix-edit.patch | 13 - .../hamster-applet-2.32.1-r1.ebuild | 63 - .../hamster-applet-2.32.1.ebuild | 78 - gnome-extra/hamster-applet/metadata.xml | 9 - gnome-extra/libgail-gnome/Manifest | 1 - .../libgail-gnome/libgail-gnome-1.20.4.ebuild | 29 - gnome-extra/libgail-gnome/metadata.xml | 5 - gnome-extra/libgda/Manifest | 1 - ...da-4.99.1-gda-browser-help-collision.patch | 38 - .../libgda-4.99.4-disable-broken-tests.patch | 15 - ...ibgda-4.99.4-statement-rewriting-fix.patch | 465 ------ .../libgda/files/libgda-5.0.3-custom.vala | 6 - .../libgda/files/libgda-5.1.2-graphviz.patch | 100 -- gnome-extra/libgda/libgda-4.2.13.ebuild | 114 -- gnome-extra/lock-keys-applet/Manifest | 1 - .../lock-keys-applet-1.0.ebuild | 37 - gnome-extra/lock-keys-applet/metadata.xml | 5 - gnome-extra/mousetweaks/Manifest | 2 - .../mousetweaks/mousetweaks-2.32.1.ebuild | 36 - .../mousetweaks/mousetweaks-3.10.0.ebuild | 36 - gnome-extra/nautilus-actions/Manifest | 1 - gnome-extra/nautilus-actions/metadata.xml | 3 - .../nautilus-actions-3.2.2-r200.ebuild | 57 - gnome-extra/nautilus-open-terminal/Manifest | 1 - .../nautilus-open-terminal/metadata.xml | 5 - .../nautilus-open-terminal-0.20.ebuild | 42 - gnome-extra/nautilus-sendto/Manifest | 1 - .../nautilus-sendto-2.28.4-gseal-enable.patch | 34 - .../nautilus-sendto-2.28.4-item-focus.patch | 32 - ...autilus-sendto-2.28.4-remove-empathy.patch | 387 ----- ...autilus-sendto-2.28.4-remove-old-evo.patch | 273 ---- ...utilus-sendto-2.28.4-shadowed-mounts.patch | 83 -- ...us-sendto-2.28.4-thunderbird-command.patch | 36 - .../nautilus-sendto-2.28.4-unload-dbus.patch | 24 - .../nautilus-sendto-2.28.4-unload-init.patch | 23 - .../files/nautilus-sendto-2.28.4-unload.patch | 120 -- ...tilus-sendto-2.28.5-commandline-help.patch | 34 - .../nautilus-sendto-2.28.5-fix-memleaks.patch | 55 - gnome-extra/nautilus-sendto/metadata.xml | 6 - .../nautilus-sendto-2.32.0.ebuild | 59 - gnome-extra/nemo/Manifest | 1 - gnome-extra/nemo/nemo-1.8.5.ebuild | 91 -- gnome-extra/panflute/Manifest | 1 - .../files/panflute-0.6.2-libnotify-0.7.patch | 13 - gnome-extra/panflute/metadata.xml | 9 - gnome-extra/panflute/panflute-0.7.0.ebuild | 85 -- gnome-extra/sensors-applet/Manifest | 2 - .../sensors-applet-2.2.7-libnotify-0.7.patch | 57 - .../sensors-applet-2.2.7-underlinking.patch | 37 - gnome-extra/sensors-applet/metadata.xml | 10 - .../sensors-applet-2.2.7-r1.ebuild | 77 - .../sensors-applet-3.0.0.ebuild | 63 - gnome-extra/swfdec-gnome/Manifest | 1 - gnome-extra/swfdec-gnome/metadata.xml | 8 - .../swfdec-gnome/swfdec-gnome-2.30.1.ebuild | 25 - gnome-extra/tasks/Manifest | 1 - .../tasks/files/tasks-0.14-configh.patch | 10 - .../tasks/files/tasks-0.16-asneeded.patch | 42 - gnome-extra/tasks/metadata.xml | 16 - gnome-extra/tasks/tasks-0.20.ebuild | 35 - gnome-extra/yelp/Manifest | 2 - .../yelp/files/yelp-2.30.2-freeze-move.patch | 116 -- .../yelp/files/yelp-2.30.2-gthread.patch | 12 - .../yelp/files/yelp-2.30.2-print-crash.patch | 38 - .../yelp/files/yelp-2.30.2-uri-handler.patch | 28 - .../yelp/files/yelp-2.30.2-xz-support.patch | 229 --- gnome-extra/yelp/yelp-2.30.2-r200.ebuild | 73 - gnome-extra/yelp/yelp-3.10.2.ebuild | 54 - gnome-extra/zenity/Manifest | 2 - .../files/zenity-2.32.1-libnotify-0.7.patch | 27 - .../files/zenity-3.8.0-broken-autoclose.patch | 95 -- .../files/zenity-3.8.0-double-click.patch | 26 - .../files/zenity-3.8.0-listbox-expand.patch | 20 - gnome-extra/zenity/metadata.xml | 4 - gnome-extra/zenity/zenity-2.32.1.ebuild | 52 - gnome-extra/zenity/zenity-3.8.0-r2.ebuild | 63 - mail-client/balsa/Manifest | 1 - mail-client/balsa/balsa-2.4.13.ebuild | 104 -- mail-client/evolution/Manifest | 3 - .../evolution/evolution-2.32.3-r1.ebuild | 197 --- mail-client/evolution/evolution-3.12.7.ebuild | 153 -- .../evolution-2.32.0-wrong-lafile-usage.patch | 13 - .../evolution-2.32.1-libnotify-0.7.patch | 81 -- .../files/evolution-2.32.2-mime-handler.patch | 133 -- .../files/evolution-2.32.2-smime-fix.patch | 76 - .../evolution-2.32.3-g_thread_init.patch | 89 -- .../evolution-2.32.3-gmodule-explicit.patch | 25 - .../files/evolution-2.32.3-libxml2-2.9.patch | 43 - mail-client/evolution/metadata.xml | 4 - media-gfx/byzanz/Manifest | 1 - media-gfx/byzanz/byzanz-0.2.3.ebuild | 33 - media-gfx/byzanz/metadata.xml | 7 - media-gfx/eog/Manifest | 3 - media-gfx/eog/eog-2.32.1.ebuild | 75 - media-gfx/eog/eog-3.10.2.ebuild | 58 - media-gfx/eog/eog-3.12.1.ebuild | 58 - media-gfx/eog/files/eog-2.32.1-gmodule.patch | 25 - media-gfx/shared-color-profiles/Manifest | 1 - media-gfx/shared-color-profiles/metadata.xml | 5 - .../shared-color-profiles-0.1.5.ebuild | 27 - media-libs/gupnp-dlna/Manifest | 1 - media-libs/gupnp-dlna/gupnp-dlna-0.6.6.ebuild | 38 - media-libs/swfdec/Manifest | 1 - media-libs/swfdec/metadata.xml | 25 - media-libs/swfdec/swfdec-0.8.4.ebuild | 94 -- media-sound/pulseaudio/Manifest | 2 - .../pulseaudio/pulseaudio-2.1-r1.ebuild | 228 --- media-sound/pulseaudio/pulseaudio-4.0.ebuild | 235 --- media-sound/sound-juicer/Manifest | 3 - ...und-juicer-2.28.2-fix-pause-conflict.patch | 20 - .../sound-juicer-2.32.0-desktop-file.patch | 13 - .../sound-juicer-2.32.0-r1.ebuild | 69 - .../sound-juicer/sound-juicer-3.11.90.ebuild | 69 - .../sound-juicer-3.5.1_pre20130826.ebuild | 72 - media-video/cheese/Manifest | 2 - media-video/cheese/cheese-2.32.0.ebuild | 60 - media-video/cheese/cheese-3.10.2.ebuild | 82 -- media-video/gxine/gxine-0.5.907.ebuild | 104 -- media-video/gxine/metadata.xml | 3 - media-video/totem/Manifest | 2 - .../files/totem-2.30.2-mp2t-support.patch | 21 - ...tem-2.32.0-smclient-target-detection.patch | 48 - media-video/totem/metadata.xml | 6 - media-video/totem/totem-2.32.0-r2.ebuild | 206 --- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- .../md5-cache/app-accessibility/dasher-4.11 | 13 - .../java-access-bridge-1.26.2 | 13 - .../app-accessibility/morseall-0.5.0 | 11 - .../system-config-printer-common-1.3.12 | 14 - .../system-config-printer-common-1.3.13 | 15 - .../system-config-printer-gnome-1.3.12 | 14 - .../system-config-printer-gnome-1.3.13 | 15 - metadata/md5-cache/app-dicts/verbiste-0.1.38 | 13 - .../app-editors/emacs-vcs-24.4.9999-r1 | 12 - .../app-editors/emacs-vcs-25.0.50_pre20141031 | 2 +- .../app-editors/emacs-vcs-25.0.50_pre20141110 | 2 +- .../md5-cache/app-editors/emacs-vcs-25.0.9999 | 12 - .../app-editors/emacs-vcs-25.0.9999-r1 | 2 +- metadata/md5-cache/app-i18n/im-ja-1.5-r2 | 13 - metadata/md5-cache/app-i18n/uim-1.7.3 | 15 - metadata/md5-cache/app-i18n/uim-1.7.3-r1 | 15 - metadata/md5-cache/app-i18n/uim-1.8.0 | 15 - metadata/md5-cache/app-i18n/uim-1.8.0-r1 | 15 - metadata/md5-cache/app-i18n/uim-1.8.2 | 15 - metadata/md5-cache/app-i18n/uim-1.8.2-r1 | 15 - metadata/md5-cache/app-i18n/uim-1.8.3 | 15 - metadata/md5-cache/app-i18n/uim-1.8.3-r1 | 15 - metadata/md5-cache/app-i18n/uim-1.8.4 | 15 - metadata/md5-cache/app-i18n/uim-1.8.4-r1 | 15 - metadata/md5-cache/app-i18n/uim-1.8.6 | 15 - .../md5-cache/dev-dotnet/gtkhtml-sharp-2.26.0 | 14 - metadata/md5-cache/dev-libs/libgdata-0.16.0 | 13 - metadata/md5-cache/dev-libs/libgdata-0.8.1-r2 | 13 - .../md5-cache/dev-libs/libgweather-2.30.3 | 13 - .../dev-python/brasero-python-2.32.0 | 14 - .../dev-python/brasero-python-2.32.0-r1 | 15 - .../dev-python/bug-buddy-python-2.32.0 | 13 - .../dev-python/bug-buddy-python-2.32.0-r1 | 15 - .../md5-cache/dev-python/evince-python-2.32.0 | 13 - .../dev-python/evince-python-2.32.0-r1 | 15 - .../dev-python/evolution-python-2.32.0 | 13 - .../dev-python/evolution-python-2.32.0-r1 | 15 - .../dev-python/gnome-applets-python-2.32.0 | 14 - .../dev-python/gnome-applets-python-2.32.0-r1 | 15 - .../dev-python/gnome-desktop-python-2.32.0 | 13 - .../dev-python/gnome-desktop-python-2.32.0-r1 | 15 - .../dev-python/gnome-media-python-2.32.0 | 14 - .../dev-python/gnome-media-python-2.32.0-r1 | 15 - metadata/md5-cache/dev-python/gns3-gui-1.1 | 14 + .../md5-cache/dev-python/libgda-python-2.25.3 | 14 - .../dev-python/libgda-python-2.25.3-r1 | 15 - .../dev-python/libgksu-python-2.25.3 | 14 - .../dev-python/libgksu-python-2.25.3-r1 | 15 - .../dev-python/libgnomeprint-python-2.32.0 | 14 - .../dev-python/libgnomeprint-python-2.32.0-r1 | 15 - .../dev-python/libgtop-python-2.32.0 | 13 - .../dev-python/libgtop-python-2.32.0-r1 | 15 - .../dev-python/nautilus-python-0.7.3 | 13 - .../md5-cache/dev-python/totem-python-2.32.0 | 13 - .../dev-python/totem-python-2.32.0-r1 | 15 - metadata/md5-cache/dev-util/mono-tools-2.10 | 13 - metadata/md5-cache/dev-vcs/bzr-gtk-0.100.0 | 13 - metadata/md5-cache/dev-vcs/giggle-0.6.2 | 13 - metadata/md5-cache/dev-vcs/giggle-0.7 | 13 - metadata/md5-cache/gnome-base/gconf-2.32.4-r1 | 13 - metadata/md5-cache/gnome-base/gconf-3.2.6-r1 | 14 - metadata/md5-cache/gnome-base/gconf-3.2.6-r2 | 14 - metadata/md5-cache/gnome-base/gdm-2.20.11-r1 | 13 - metadata/md5-cache/gnome-base/gnome-2.32.1-r2 | 11 - metadata/md5-cache/gnome-base/gnome-3.10.0 | 11 - .../gnome-base/gnome-applets-2.32.1.1-r2 | 13 - .../gnome-base/gnome-control-center-2.32.1-r1 | 13 - .../md5-cache/gnome-base/gnome-fallback-3.6.2 | 10 - .../md5-cache/gnome-base/gnome-fallback-3.8.0 | 10 - .../gnome-base/gnome-keyring-2.32.1-r1 | 15 - .../md5-cache/gnome-base/gnome-keyring-3.10.1 | 13 - .../md5-cache/gnome-base/gnome-keyring-3.12.0 | 13 - .../md5-cache/gnome-base/gnome-keyring-3.12.2 | 13 - .../gnome-base/gnome-light-2.32.1-r2 | 11 - .../md5-cache/gnome-base/gnome-light-3.10.0 | 11 - .../gnome-base/gnome-menus-2.30.5-r1 | 13 - .../md5-cache/gnome-base/gnome-menus-3.0.1-r2 | 14 - .../md5-cache/gnome-base/gnome-menus-3.10.1 | 13 - .../gnome-base/gnome-panel-2.32.1-r3 | 13 - .../md5-cache/gnome-base/gnome-panel-3.8.0-r1 | 13 - .../gnome-base/gnome-session-2.32.1-r3 | 13 - .../gnome-settings-daemon-2.32.1-r2 | 13 - .../gnome-base/libgnome-keyring-2.32.0 | 13 - .../gnome-base/libgnomekbd-2.32.0-r1 | 13 - .../md5-cache/gnome-base/nautilus-2.32.2.1-r2 | 14 - metadata/md5-cache/gnome-base/nautilus-3.10.1 | 15 - metadata/md5-cache/gnome-base/nautilus-3.12.0 | 15 - .../md5-cache/gnome-extra/at-spi-1.32.0-r2 | 14 - metadata/md5-cache/gnome-extra/at-spi-2.8.0 | 9 - .../md5-cache/gnome-extra/bug-buddy-2.32.0-r2 | 13 - .../md5-cache/gnome-extra/cinnamon-2.2.16-r1 | 14 - .../gnome-extra/deskbar-applet-2.32.0 | 13 - .../evolution-data-server-2.32.3-r3 | 13 - .../evolution-data-server-3.12.7.1 | 15 - .../gnome-extra/evolution-exchange-2.32.3 | 13 - .../gnome-extra/evolution-webcal-2.32.0 | 12 - .../fast-user-switch-applet-2.24.0 | 13 - .../gnome-extra/file-browser-applet-0.6.7 | 13 - .../md5-cache/gnome-extra/gcalctool-5.32.2 | 12 - .../md5-cache/gnome-extra/gcalctool-6.6.2 | 12 - .../md5-cache/gnome-extra/gconf-editor-2.32.0 | 12 - .../md5-cache/gnome-extra/gnome-audio-2.22.2 | 12 - .../gnome-extra/gnome-color-manager-2.32.0 | 14 - .../gnome-extra/gnome-color-manager-3.10.1 | 14 - .../md5-cache/gnome-extra/gnome-games-2.28.2 | 14 - .../gnome-extra/gnome-games-extra-data-2.26.0 | 12 - .../gnome-extra/gnome-games-extra-data-2.30.0 | 12 - .../gnome-extra/gnome-hdaps-applet-20081204 | 12 - .../gnome-extra/gnome-media-2.32.0-r1 | 13 - .../gnome-extra/gnome-media-2.32.0-r300 | 12 - .../md5-cache/gnome-extra/gnome-media-3.4.0 | 12 - .../gnome-extra/gnome-power-manager-2.32.0-r3 | 14 - .../gnome-extra/gnome-screensaver-2.30.2-r1 | 13 - .../gnome-extra/gnome-screensaver-3.6.1 | 13 - .../md5-cache/gnome-extra/gnome-swallow-1.2 | 13 - .../gnome-system-monitor-2.28.2-r1 | 12 - .../gnome-extra/gnome-system-monitor-3.10.2 | 13 - .../gnome-extra/gnome-user-docs-2.32.0 | 12 - .../gnome-extra/gnome-user-docs-3.10.3 | 13 - .../gnome-extra/gnome-user-share-2.30.1 | 12 - .../gnome-extra/gnome-utils-2.32.0-r2 | 13 - metadata/md5-cache/gnome-extra/gtkhtml-3.32.2 | 12 - metadata/md5-cache/gnome-extra/gtkhtml-4.8.4 | 12 - .../gnome-extra/hamster-applet-2.32.1 | 13 - .../gnome-extra/hamster-applet-2.32.1-r1 | 13 - .../gnome-extra/libgail-gnome-1.20.4 | 13 - metadata/md5-cache/gnome-extra/libgda-4.2.13 | 14 - .../gnome-extra/lock-keys-applet-1.0 | 13 - .../md5-cache/gnome-extra/mousetweaks-2.32.1 | 12 - .../md5-cache/gnome-extra/mousetweaks-3.10.0 | 12 - .../gnome-extra/nautilus-actions-3.2.2-r200 | 13 - .../gnome-extra/nautilus-open-terminal-0.20 | 12 - .../gnome-extra/nautilus-sendto-2.32.0 | 13 - metadata/md5-cache/gnome-extra/nemo-1.8.5 | 14 - metadata/md5-cache/gnome-extra/panflute-0.7.0 | 13 - .../gnome-extra/sensors-applet-2.2.7-r1 | 14 - .../gnome-extra/sensors-applet-3.0.0 | 13 - .../md5-cache/gnome-extra/swfdec-gnome-2.30.1 | 12 - metadata/md5-cache/gnome-extra/tasks-0.20 | 12 - .../md5-cache/gnome-extra/yelp-2.30.2-r200 | 13 - metadata/md5-cache/gnome-extra/yelp-3.10.2 | 13 - metadata/md5-cache/gnome-extra/zenity-2.32.1 | 13 - .../md5-cache/gnome-extra/zenity-3.8.0-r2 | 13 - metadata/md5-cache/mail-client/balsa-2.4.13 | 14 - .../md5-cache/mail-client/evolution-2.32.3-r1 | 13 - .../md5-cache/mail-client/evolution-3.12.7 | 13 - metadata/md5-cache/media-gfx/byzanz-0.2.3 | 12 - metadata/md5-cache/media-gfx/eog-2.32.1 | 13 - metadata/md5-cache/media-gfx/eog-3.10.2 | 14 - metadata/md5-cache/media-gfx/eog-3.12.1 | 14 - .../media-gfx/shared-color-profiles-0.1.5 | 10 - .../md5-cache/media-libs/gupnp-dlna-0.6.6 | 13 - metadata/md5-cache/media-libs/swfdec-0.8.4 | 14 - .../md5-cache/media-sound/pulseaudio-2.1-r1 | 15 - metadata/md5-cache/media-sound/pulseaudio-4.0 | 15 - .../media-sound/sound-juicer-2.32.0-r1 | 13 - .../media-sound/sound-juicer-3.11.90 | 13 - .../sound-juicer-3.5.1_pre20130826 | 13 - metadata/md5-cache/media-video/cheese-2.32.0 | 13 - metadata/md5-cache/media-video/cheese-3.10.2 | 13 - metadata/md5-cache/media-video/gxine-0.5.907 | 13 - .../md5-cache/media-video/totem-2.32.0-r2 | 13 - .../net-analyzer/gnome-netstatus-2.28.2 | 13 - .../net-analyzer/gnome-nettool-2.32.0 | 13 - .../net-analyzer/netspeed_applet-0.16 | 12 - .../md5-cache/net-analyzer/wireshark-1.12.2 | 4 +- metadata/md5-cache/net-im/empathy-2.34.0-r2 | 14 - metadata/md5-cache/net-im/empathy-3.12.6 | 14 - .../net-im/telepathy-logger-0.4.0-r1 | 13 - .../md5-cache/net-im/telepathy-logger-0.6.0 | 13 - .../telepathy-mission-control-5.14.0-r1 | 14 - .../net-im/telepathy-mission-control-5.14.1 | 15 - metadata/md5-cache/net-libs/farsight2-0.0.31 | 14 - metadata/md5-cache/net-libs/gtk-vnc-0.5.2 | 14 - metadata/md5-cache/net-libs/gupnp-vala-0.10.5 | 12 - metadata/md5-cache/net-libs/libepc-0.4.4 | 14 - metadata/md5-cache/net-mail/gnubiff-2.2.13-r2 | 13 - metadata/md5-cache/net-mail/gnubiff-2.2.13-r3 | 13 - metadata/md5-cache/net-mail/gnubiff-2.2.15 | 13 - metadata/md5-cache/net-mail/gnubiff-2.2.15-r1 | 13 - metadata/md5-cache/net-misc/blogtk-2.0-r1 | 14 - metadata/md5-cache/net-misc/curl-7.39.0 | 4 +- metadata/md5-cache/net-misc/drivel-3.0.5 | 13 - metadata/md5-cache/net-misc/gnome-blog-0.9.2 | 12 - metadata/md5-cache/net-misc/tsclient-2.0.1-r1 | 13 - metadata/md5-cache/net-misc/vinagre-2.30.3 | 13 - metadata/md5-cache/net-misc/vino-2.32.2-r2 | 14 - .../md5-cache/net-misc/youtube-dl-2014.11.12 | 14 - ...be-dl-2014.11.09 => youtube-dl-2014.11.13} | 4 +- .../net-voip/telepathy-gabble-0.16.6 | 13 - .../net-voip/telepathy-gabble-0.18.2 | 13 - .../md5-cache/net-voip/telepathy-haze-0.6.0 | 13 - .../md5-cache/net-voip/telepathy-rakia-0.7.4 | 13 - .../net-wireless/gnome-bluetooth-2.32.0-r1 | 14 - .../md5-cache/sci-calculators/orpie-1.5.1-r1 | 2 +- .../sys-apps/gnome-disk-utility-3.0.2-r201 | 13 - .../sys-apps/gnome-disk-utility-3.10.0 | 13 - .../md5-cache/www-client/epiphany-2.30.6-r1 | 13 - .../www-client/epiphany-extensions-2.32.0-r1 | 13 - .../www-plugins/adobe-flash-11.2.202.411 | 15 - .../www-plugins/swfdec-mozilla-0.8.2-r1 | 12 - metadata/md5-cache/x11-misc/alacarte-0.13.2 | 12 - .../md5-cache/x11-misc/glunarclock-0.34.1 | 12 - metadata/md5-cache/x11-plugins/wmlife-1.0.1 | 12 - .../x11-terms/gnome-terminal-2.32.1-r1 | 12 - .../md5-cache/x11-terms/gnome-terminal-3.10.2 | 13 - .../md5-cache/x11-terms/gnome-terminal-3.12.2 | 13 - .../x11-themes/gnome-backgrounds-2.32.0 | 11 - .../x11-themes/gnome-backgrounds-3.10.1 | 11 - .../x11-themes/gnome-backgrounds-3.12.1 | 11 - .../x11-themes/gnome-icon-theme-3.10.0 | 14 - .../x11-themes/gnome-icon-theme-3.6.2 | 14 - .../x11-themes/gnome-themes-2.32.1-r1 | 13 - .../x11-themes/gnome-themes-extras-2.22.0-r1 | 13 - .../x11-themes/gtk-engines-cleanice-2.4.1 | 12 - .../x11-themes/gtk-engines-dwerg-0.8 | 12 - metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- net-analyzer/gnome-netstatus/Manifest | 1 - .../gnome-netstatus-2.12.1-fix-iflist.patch | 25 - .../gnome-netstatus-2.28.2.ebuild | 47 - net-analyzer/gnome-netstatus/metadata.xml | 5 - net-analyzer/gnome-nettool/Manifest | 1 - .../files/gnome-nettool-2.18.0-fbsd.patch | 343 ----- .../gnome-nettool-3.2.0-extra-path.patch | 82 -- .../gnome-nettool/gnome-nettool-2.32.0.ebuild | 44 - net-analyzer/netspeed_applet/Manifest | 1 - net-analyzer/netspeed_applet/metadata.xml | 5 - .../netspeed_applet-0.16.ebuild | 28 - .../wireshark/wireshark-1.12.2.ebuild | 4 +- net-im/empathy/Manifest | 2 - net-im/empathy/empathy-2.34.0-r2.ebuild | 118 -- net-im/empathy/empathy-3.12.6.ebuild | 121 -- .../files/empathy-2.34.0-CVE-2011-3635.patch | 70 - ...empathy-2.34.0-auth-dialog-crash-fix.patch | 24 - .../empathy-2.34.0-missing-include.patch | 10 - net-im/empathy/metadata.xml | 3 - net-im/telepathy-logger/Manifest | 2 - .../telepathy-logger-0.4.0-r1.ebuild | 56 - .../telepathy-logger-0.6.0.ebuild | 52 - net-im/telepathy-mission-control/Manifest | 2 - ...telepathy-mission-control-5.14.0-r1.ebuild | 54 - .../telepathy-mission-control-5.14.1.ebuild | 57 - net-libs/farsight2/Manifest | 1 - net-libs/farsight2/farsight2-0.0.31.ebuild | 77 - .../files/farsight2-0.0.20-make-382.patch | 31 - net-libs/farsight2/metadata.xml | 5 - net-libs/gtk-vnc/Manifest | 1 - .../gtk-vnc/files/gtk-vnc-0.5.0-pod.patch | 124 -- .../gtk-vnc-0.5.0-pulseaudio-automagic.patch | 55 - net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild | 190 --- net-libs/gupnp-vala/Manifest | 1 - net-libs/gupnp-vala/gupnp-vala-0.10.5.ebuild | 27 - net-libs/gupnp-vala/metadata.xml | 6 - net-libs/libepc/Manifest | 1 - net-libs/libepc/libepc-0.4.4.ebuild | 38 - net-libs/libepc/metadata.xml | 5 - net-mail/gnubiff/Manifest | 1 - .../files/gnubiff-2.2.13-fix-nls.patch | 14 - .../gnubiff/files/gnubiff-2.2.13-gold.patch | 20 - net-mail/gnubiff/gnubiff-2.2.13-r2.ebuild | 50 - net-mail/gnubiff/gnubiff-2.2.13-r3.ebuild | 45 - net-mail/gnubiff/gnubiff-2.2.15-r1.ebuild | 49 - net-mail/gnubiff/gnubiff-2.2.15.ebuild | 49 - net-misc/blogtk/Manifest | 1 - net-misc/blogtk/blogtk-2.0-r1.ebuild | 60 - .../blogtk/files/blogtk-2.0-destdir.patch | 23 - net-misc/blogtk/metadata.xml | 5 - net-misc/curl/curl-7.39.0.ebuild | 4 +- net-misc/drivel/Manifest | 1 - net-misc/drivel/drivel-3.0.5.ebuild | 58 - net-misc/drivel/metadata.xml | 5 - net-misc/gnome-blog/Manifest | 1 - net-misc/gnome-blog/gnome-blog-0.9.2.ebuild | 59 - net-misc/gnome-blog/metadata.xml | 15 - net-misc/tsclient/Manifest | 1 - .../files/tsclient-2.0.1-desktop-file.patch | 11 - .../files/tsclient-2.0.1-glib-2.32.patch | 21 - .../files/tsclient-2.0.1-libnotify-0.7.patch | 54 - .../tsclient-2.0.1-no-networkmanager.patch | 40 - net-misc/tsclient/metadata.xml | 8 - net-misc/tsclient/tsclient-2.0.1-r1.ebuild | 72 - net-misc/vinagre/Manifest | 1 - .../files/vinagre-2.30.3-gmodule.patch | 12 - net-misc/vinagre/metadata.xml | 2 - net-misc/vinagre/vinagre-2.30.3.ebuild | 71 - net-misc/vino/Manifest | 1 - .../files/vino-2.26.2-autorestart-loop.patch | 14 - .../files/vino-3.6.2-clipboard-leak.patch | 51 - .../vino/files/vino-3.8.1-new-client.patch | 28 - net-misc/vino/vino-2.32.2-r2.ebuild | 87 -- net-misc/youtube-dl/Manifest | 3 +- .../youtube-dl/youtube-dl-2014.11.09.ebuild | 59 - ...12.ebuild => youtube-dl-2014.11.13.ebuild} | 2 +- net-voip/telepathy-gabble/Manifest | 2 - .../telepathy-gabble-0.16.6.ebuild | 71 - .../telepathy-gabble-0.18.2.ebuild | 72 - net-voip/telepathy-haze/Manifest | 1 - .../telepathy-haze-0.6.0.ebuild | 39 - net-voip/telepathy-rakia/Manifest | 1 - .../telepathy-rakia-0.7.4-gio-linking.patch | 30 - .../telepathy-rakia-0.7.4.ebuild | 43 - net-wireless/gnome-bluetooth/Manifest | 2 - .../gnome-bluetooth/files/80-rfkill.rules | 5 - .../gnome-bluetooth-2.32.0-fix-typo.patch | 22 - ...bluetooth-2.32.0-introspection-build.patch | 208 --- ...gnome-bluetooth-2.32.0-libnotify-0.7.patch | 27 - ...gnome-bluetooth-2.32.0-nsd-automagic.patch | 28 - .../gnome-bluetooth-2.32.0-pin-quirk.patch | 23 - .../gnome-bluetooth-2.32.0-update-dtd.patch | 21 - .../gnome-bluetooth-2.32.0-r1.ebuild | 110 -- net-wireless/gnome-bluetooth/metadata.xml | 4 - profiles/use.local.desc | 42 - .../orpie/files/orpie-1.5.1-tinfo.patch | 10 + sci-calculators/orpie/orpie-1.5.1-r1.ebuild | 5 +- sys-apps/gnome-disk-utility/Manifest | 2 - ...e-disk-utility-2.32.1-non-utf8-crash.patch | 32 - ...e-disk-utility-2.32.1-optional-avahi.patch | 92 -- ...-utility-3.0.2-nautilus2-compat-r201.patch | 39 - ...-disk-utility-3.0.2-nautilus2-compat.patch | 35 - ...e-disk-utility-3.0.2-separate-libgdu.patch | 384 ----- ...isk-utility-3.8.2-kill-gsd-automagic.patch | 45 - ...k-utility-3.8.2-raise-gsd-dependency.patch | 34 - .../gnome-disk-utility-3.0.2-r201.ebuild | 67 - .../gnome-disk-utility-3.10.0.ebuild | 56 - sys-apps/gnome-disk-utility/metadata.xml | 3 - www-client/epiphany-extensions/Manifest | 1 - .../epiphany-extensions-2.32.0-r1.ebuild | 63 - www-client/epiphany-extensions/metadata.xml | 5 - www-client/epiphany/Manifest | 1 - www-client/epiphany/epiphany-2.30.6-r1.ebuild | 90 -- .../epiphany-2.30.6-clearing-passwd.patch | 118 -- .../files/epiphany-2.30.6-dbus-fix.patch | 20 - ...epiphany-2.30.6-introspection-prefix.patch | 21 - .../files/epiphany-2.30.6-libnotify-0.7.patch | 38 - .../files/epiphany-2.30.6-mime-handler.patch | 22 - www-client/epiphany/metadata.xml | 1 - www-plugins/adobe-flash/Manifest | 3 - .../adobe-flash-11.2.202.411.ebuild | 248 ---- www-plugins/swfdec-mozilla/Manifest | 1 - .../swfdec-mozilla-0.8.2-fix-crash.patch | 21 - www-plugins/swfdec-mozilla/metadata.xml | 9 - .../swfdec-mozilla-0.8.2-r1.ebuild | 41 - x11-misc/alacarte/Manifest | 1 - x11-misc/alacarte/alacarte-0.13.2.ebuild | 79 - x11-misc/glunarclock/Manifest | 1 - .../glunarclock/glunarclock-0.34.1.ebuild | 33 - x11-misc/glunarclock/metadata.xml | 8 - x11-plugins/wmlife/Manifest | 1 - .../wmlife/files/wmlife-1.0.0-stringh.patch | 11 - .../wmlife/files/wmlife-1.0.1-configure.patch | 11 - x11-plugins/wmlife/metadata.xml | 5 - x11-plugins/wmlife/wmlife-1.0.1.ebuild | 42 - x11-terms/gnome-terminal/Manifest | 3 - .../gnome-terminal-3.10.2-sys-wait.h.patch | 24 - ...me-terminal-3.12.0-appmenu-parameter.patch | 26 - ...me-terminal-3.6.1-no-gnome-doc-utils.patch | 36 - .../gnome-terminal-3.6.1-window-resize.patch | 30 - .../gnome-terminal-2.32.1-r1.ebuild | 50 - .../gnome-terminal-3.10.2.ebuild | 79 - .../gnome-terminal-3.12.2.ebuild | 80 -- x11-themes/gnome-backgrounds/Manifest | 3 - .../gnome-backgrounds-2.32.0.ebuild | 22 - .../gnome-backgrounds-3.10.1.ebuild | 20 - .../gnome-backgrounds-3.12.1.ebuild | 22 - x11-themes/gnome-icon-theme/Manifest | 2 - ...gnome-icon-theme-2.91.7-update-cache.patch | 39 - .../gnome-icon-theme-3.10.0.ebuild | 48 - .../gnome-icon-theme-3.6.2.ebuild | 54 - x11-themes/gnome-themes-extras/Manifest | 1 - ...gnome-themes-extras-2.22.0-darklooks.patch | 13 - .../gnome-themes-extras-2.22.0-r1.ebuild | 41 - x11-themes/gnome-themes-extras/metadata.xml | 11 - x11-themes/gnome-themes/Manifest | 1 - .../files/gnome-themes-2.24.3-bashism.patch | 13 - .../gnome-themes-2.32.1-r1.ebuild | 51 - x11-themes/gnome-themes/metadata.xml | 5 - x11-themes/gtk-engines-cleanice/Manifest | 1 - .../files/cleanice-2-gtkrc | 37 - .../gtk-engines-cleanice-2.4.1.ebuild | 30 - x11-themes/gtk-engines-cleanice/metadata.xml | 5 - x11-themes/gtk-engines-dwerg/Manifest | 1 - .../gtk-engines-dwerg-0.8.ebuild | 29 - x11-themes/gtk-engines-dwerg/metadata.xml | 5 - 883 files changed, 115 insertions(+), 35939 deletions(-) delete mode 100644 app-accessibility/dasher/Manifest delete mode 100644 app-accessibility/dasher/dasher-4.11.ebuild delete mode 100644 app-accessibility/dasher/metadata.xml delete mode 100644 app-accessibility/java-access-bridge/Manifest delete mode 100644 app-accessibility/java-access-bridge/files/java-access-bridge-1.6.0-missingclasses.patch delete mode 100644 app-accessibility/java-access-bridge/java-access-bridge-1.26.2.ebuild delete mode 100644 app-accessibility/java-access-bridge/metadata.xml delete mode 100644 app-accessibility/morseall/Manifest delete mode 100644 app-accessibility/morseall/metadata.xml delete mode 100644 app-accessibility/morseall/morseall-0.5.0.ebuild delete mode 100644 app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch delete mode 100644 app-admin/system-config-printer-common/files/system-config-printer-common-1.3.13-split.patch delete mode 100644 app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild delete mode 100644 app-admin/system-config-printer-common/system-config-printer-common-1.3.13.ebuild delete mode 100644 app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch delete mode 100644 app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch delete mode 100644 app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild delete mode 100644 app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.13.ebuild delete mode 100644 app-dicts/verbiste/verbiste-0.1.38.ebuild delete mode 100644 app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild delete mode 100644 app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild delete mode 100644 app-i18n/im-ja/im-ja-1.5-r2.ebuild delete mode 100644 app-i18n/uim/files/50uim-gentoo.el delete mode 100644 app-i18n/uim/files/uim-1.7.3-glib-2.32.patch delete mode 100644 app-i18n/uim/files/uim-1.7.3-linguas.patch delete mode 100644 app-i18n/uim/files/uim-1.8.0-glib2.32.patch delete mode 100644 app-i18n/uim/uim-1.7.3-r1.ebuild delete mode 100644 app-i18n/uim/uim-1.7.3.ebuild delete mode 100644 app-i18n/uim/uim-1.8.0-r1.ebuild delete mode 100644 app-i18n/uim/uim-1.8.0.ebuild delete mode 100644 app-i18n/uim/uim-1.8.2-r1.ebuild delete mode 100644 app-i18n/uim/uim-1.8.2.ebuild delete mode 100644 app-i18n/uim/uim-1.8.3-r1.ebuild delete mode 100644 app-i18n/uim/uim-1.8.3.ebuild delete mode 100644 app-i18n/uim/uim-1.8.4-r1.ebuild delete mode 100644 app-i18n/uim/uim-1.8.4.ebuild delete mode 100644 app-i18n/uim/uim-1.8.6.ebuild delete mode 100644 dev-dotnet/gtkhtml-sharp/Manifest delete mode 100644 dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.26.0.ebuild delete mode 100644 dev-dotnet/gtkhtml-sharp/metadata.xml delete mode 100644 dev-libs/libgdata/files/libgdata-0.8.1-empty-names.patch delete mode 100644 dev-libs/libgdata/files/libgdata-0.8.1-gdata-symbols.patch delete mode 100644 dev-libs/libgdata/files/libgdata-0.8.1-validate-ssl.patch delete mode 100644 dev-libs/libgdata/libgdata-0.16.0.ebuild delete mode 100644 dev-libs/libgdata/libgdata-0.8.1-r2.ebuild delete mode 100644 dev-libs/libgweather/files/libgweather-2.30.0-fix-automagic-python-support.patch delete mode 100644 dev-libs/libgweather/libgweather-2.30.3.ebuild delete mode 100644 dev-python/brasero-python/Manifest delete mode 100644 dev-python/brasero-python/brasero-python-2.32.0-r1.ebuild delete mode 100644 dev-python/brasero-python/brasero-python-2.32.0.ebuild delete mode 100644 dev-python/brasero-python/metadata.xml delete mode 100644 dev-python/bug-buddy-python/Manifest delete mode 100644 dev-python/bug-buddy-python/bug-buddy-python-2.32.0-r1.ebuild delete mode 100644 dev-python/bug-buddy-python/bug-buddy-python-2.32.0.ebuild delete mode 100644 dev-python/bug-buddy-python/metadata.xml delete mode 100644 dev-python/evince-python/Manifest delete mode 100644 dev-python/evince-python/evince-python-2.32.0-r1.ebuild delete mode 100644 dev-python/evince-python/evince-python-2.32.0.ebuild delete mode 100644 dev-python/evince-python/metadata.xml delete mode 100644 dev-python/evolution-python/Manifest delete mode 100644 dev-python/evolution-python/evolution-python-2.32.0-r1.ebuild delete mode 100644 dev-python/evolution-python/evolution-python-2.32.0.ebuild delete mode 100644 dev-python/evolution-python/metadata.xml delete mode 100644 dev-python/gnome-applets-python/Manifest delete mode 100644 dev-python/gnome-applets-python/files/gnome-applets-python-2.26.0-session-mgmt.patch delete mode 100644 dev-python/gnome-applets-python/gnome-applets-python-2.32.0-r1.ebuild delete mode 100644 dev-python/gnome-applets-python/gnome-applets-python-2.32.0.ebuild delete mode 100644 dev-python/gnome-applets-python/metadata.xml delete mode 100644 dev-python/gnome-desktop-python/Manifest delete mode 100644 dev-python/gnome-desktop-python/gnome-desktop-python-2.32.0-r1.ebuild delete mode 100644 dev-python/gnome-desktop-python/gnome-desktop-python-2.32.0.ebuild delete mode 100644 dev-python/gnome-desktop-python/metadata.xml delete mode 100644 dev-python/gnome-media-python/Manifest delete mode 100644 dev-python/gnome-media-python/gnome-media-python-2.32.0-r1.ebuild delete mode 100644 dev-python/gnome-media-python/gnome-media-python-2.32.0.ebuild delete mode 100644 dev-python/gnome-media-python/metadata.xml create mode 100644 dev-python/gns3-gui/Manifest create mode 100644 dev-python/gns3-gui/gns3-gui-1.1.ebuild create mode 100644 dev-python/gns3-gui/metadata.xml delete mode 100644 dev-python/libgda-python/Manifest delete mode 100644 dev-python/libgda-python/files/libgda-python-2.25.3-python-libs.patch delete mode 100644 dev-python/libgda-python/libgda-python-2.25.3-r1.ebuild delete mode 100644 dev-python/libgda-python/libgda-python-2.25.3.ebuild delete mode 100644 dev-python/libgda-python/metadata.xml delete mode 100644 dev-python/libgksu-python/Manifest delete mode 100644 dev-python/libgksu-python/files/libgksu-python-2.25.3-python-libs.patch delete mode 100644 dev-python/libgksu-python/libgksu-python-2.25.3-r1.ebuild delete mode 100644 dev-python/libgksu-python/libgksu-python-2.25.3.ebuild delete mode 100644 dev-python/libgksu-python/metadata.xml delete mode 100644 dev-python/libgnomeprint-python/Manifest delete mode 100644 dev-python/libgnomeprint-python/libgnomeprint-python-2.32.0-r1.ebuild delete mode 100644 dev-python/libgnomeprint-python/libgnomeprint-python-2.32.0.ebuild delete mode 100644 dev-python/libgnomeprint-python/metadata.xml delete mode 100644 dev-python/libgtop-python/Manifest delete mode 100644 dev-python/libgtop-python/libgtop-python-2.32.0-r1.ebuild delete mode 100644 dev-python/libgtop-python/libgtop-python-2.32.0.ebuild delete mode 100644 dev-python/libgtop-python/metadata.xml delete mode 100644 dev-python/nautilus-python/nautilus-python-0.7.3.ebuild delete mode 100644 dev-python/totem-python/Manifest delete mode 100644 dev-python/totem-python/metadata.xml delete mode 100644 dev-python/totem-python/totem-python-2.32.0-r1.ebuild delete mode 100644 dev-python/totem-python/totem-python-2.32.0.ebuild delete mode 100644 dev-util/mono-tools/Manifest delete mode 100644 dev-util/mono-tools/files/mono-tools-2.10-autoconf.patch delete mode 100644 dev-util/mono-tools/files/mono-tools-2.8-html-renderer-fixes.patch delete mode 100644 dev-util/mono-tools/metadata.xml delete mode 100644 dev-util/mono-tools/mono-tools-2.10.ebuild delete mode 100644 dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild delete mode 100644 dev-vcs/giggle/files/giggle-0.6.1-gmodule-explicit.patch delete mode 100644 dev-vcs/giggle/giggle-0.6.2.ebuild delete mode 100644 dev-vcs/giggle/giggle-0.7.ebuild delete mode 100644 gnome-base/gconf/gconf-2.32.4-r1.ebuild delete mode 100644 gnome-base/gconf/gconf-3.2.6-r1.ebuild delete mode 100644 gnome-base/gconf/gconf-3.2.6-r2.ebuild delete mode 100644 gnome-base/gdm/files/49-keychain delete mode 100644 gnome-base/gdm/files/50-ssh-agent delete mode 100644 gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch delete mode 100644 gnome-base/gdm/files/gdm-2.20.10-custom-session.patch delete mode 100644 gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch delete mode 100644 gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch delete mode 100644 gnome-base/gdm/files/gdm-2.20.10-xinitrc-ssh-agent.patch delete mode 100644 gnome-base/gdm/files/gdm-2.20.11-underlinking.patch delete mode 100644 gnome-base/gdm/files/gdm-2.20.2-gksu.patch delete mode 100644 gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch delete mode 100644 gnome-base/gdm/gdm-2.20.11-r1.ebuild delete mode 100644 gnome-base/gnome-applets/Manifest delete mode 100644 gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-dbus-fix.patch delete mode 100644 gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch delete mode 100644 gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch delete mode 100644 gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-underlinking.patch delete mode 100644 gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild delete mode 100644 gnome-base/gnome-applets/metadata.xml delete mode 100644 gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-duplicated-background.patch delete mode 100644 gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-erase-background.patch delete mode 100644 gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch delete mode 100644 gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler.patch delete mode 100644 gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler2.patch delete mode 100644 gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler3.patch delete mode 100644 gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch delete mode 100644 gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild delete mode 100644 gnome-base/gnome-fallback/Manifest delete mode 100644 gnome-base/gnome-fallback/gnome-fallback-3.6.2.ebuild delete mode 100644 gnome-base/gnome-fallback/gnome-fallback-3.8.0.ebuild delete mode 100644 gnome-base/gnome-fallback/metadata.xml delete mode 100644 gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-fix-undefined.patch delete mode 100644 gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-glib-2.32.patch delete mode 100644 gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild delete mode 100644 gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild delete mode 100644 gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild delete mode 100644 gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild delete mode 100644 gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild delete mode 100644 gnome-base/gnome-light/gnome-light-3.10.0.ebuild delete mode 100644 gnome-base/gnome-menus/files/10-xdg-menu-gnome delete mode 100644 gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 delete mode 100644 gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch delete mode 100644 gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch delete mode 100644 gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch delete mode 100644 gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch delete mode 100644 gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch delete mode 100644 gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch delete mode 100644 gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild delete mode 100644 gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild delete mode 100644 gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild delete mode 100644 gnome-base/gnome-panel/Manifest delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-2.32.1-as-needed.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-2.32.1-evo-month.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-2.32.1-fix-multiscreen.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-2.32.1-fix-multiscreen2.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-2.32.1-gmodule.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-3.6.2-drop-commandline.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-3.6.2-fix-animation.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-3.6.2-fix-black.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-3.6.2-generic-marshaller.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-3.6.2-gweather-include.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-3.6.2-rename-function.patch delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-3.6.2-resurrect-function.patch delete mode 100644 gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild delete mode 100644 gnome-base/gnome-panel/gnome-panel-3.8.0-r1.ebuild delete mode 100644 gnome-base/gnome-panel/metadata.xml delete mode 100755 gnome-base/gnome-session/files/10-user-dirs-update-gnome delete mode 100644 gnome-base/gnome-session/files/15-xdg-data-gnome delete mode 100644 gnome-base/gnome-session/files/defaults.list delete mode 100644 gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch delete mode 100644 gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size.patch delete mode 100644 gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size2.patch delete mode 100644 gnome-base/gnome-session/files/gnome-session-2.32.1-gnome3-conditions.patch delete mode 100644 gnome-base/gnome-session/files/gnome-session-2.32.1-gsettings-conditions.patch delete mode 100644 gnome-base/gnome-session/files/gnome-session-2.32.1-idle-transition.patch delete mode 100644 gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch delete mode 100644 gnome-base/gnome-session/files/gnome-session-3.8.4-presence-crash.patch delete mode 100644 gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild delete mode 100644 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-lcdfilter.patch delete mode 100644 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch delete mode 100644 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch delete mode 100644 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch delete mode 100644 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch delete mode 100644 gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch delete mode 100644 gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild delete mode 100644 gnome-base/gnome/gnome-2.32.1-r2.ebuild delete mode 100644 gnome-base/gnome/gnome-3.10.0.ebuild delete mode 100644 gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-drop-test.patch delete mode 100644 gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-hang-tests.patch delete mode 100644 gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-run-test.patch delete mode 100644 gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild delete mode 100644 gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkdisplay-usage.patch delete mode 100644 gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkkeyname-replace.patch delete mode 100644 gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-unneeded-casts.patch delete mode 100644 gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild delete mode 100644 gnome-base/nautilus/files/nautilus-2.32.2.1-gold-glib2.32.patch delete mode 100644 gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild delete mode 100644 gnome-base/nautilus/nautilus-3.10.1.ebuild delete mode 100644 gnome-base/nautilus/nautilus-3.12.0.ebuild delete mode 100644 gnome-extra/at-spi/at-spi-1.32.0-r2.ebuild delete mode 100644 gnome-extra/at-spi/at-spi-2.8.0.ebuild delete mode 100644 gnome-extra/at-spi/files/at-spi-1.22.0-tests.patch delete mode 100644 gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch delete mode 100644 gnome-extra/bug-buddy/Manifest delete mode 100644 gnome-extra/bug-buddy/bug-buddy-2.32.0-r2.ebuild delete mode 100644 gnome-extra/bug-buddy/files/bug-buddy-2.32.0-gnomesession-debug.patch delete mode 100644 gnome-extra/bug-buddy/metadata.xml delete mode 100644 gnome-extra/cinnamon/cinnamon-2.2.16-r1.ebuild delete mode 100644 gnome-extra/deskbar-applet/Manifest delete mode 100644 gnome-extra/deskbar-applet/deskbar-applet-2.32.0.ebuild delete mode 100644 gnome-extra/deskbar-applet/files/deskbar-applet-2.32.0-glib-2.32.patch delete mode 100644 gnome-extra/deskbar-applet/metadata.xml delete mode 100644 gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild delete mode 100644 gnome-extra/evolution-data-server/evolution-data-server-3.12.7.1.ebuild delete mode 100644 gnome-extra/evolution-data-server/files/e-d-s-camel-skip-failing-test.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.31-gentoo_etc_services.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-g_thread_init.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-gmodule-explicit.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libical-0.48.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch delete mode 100644 gnome-extra/evolution-data-server/files/fix_relink_command.pl delete mode 100644 gnome-extra/evolution-exchange/Manifest delete mode 100644 gnome-extra/evolution-exchange/evolution-exchange-2.32.3.ebuild delete mode 100644 gnome-extra/evolution-exchange/metadata.xml delete mode 100644 gnome-extra/evolution-webcal/Manifest delete mode 100644 gnome-extra/evolution-webcal/evolution-webcal-2.32.0.ebuild delete mode 100644 gnome-extra/evolution-webcal/files/evolution-webcal-2.32.0-g_thread_init.patch delete mode 100644 gnome-extra/evolution-webcal/metadata.xml delete mode 100644 gnome-extra/fast-user-switch-applet/Manifest delete mode 100644 gnome-extra/fast-user-switch-applet/fast-user-switch-applet-2.24.0.ebuild delete mode 100644 gnome-extra/fast-user-switch-applet/files/fast-user-switch-applet-2.24.0-libgnomeui.patch delete mode 100644 gnome-extra/fast-user-switch-applet/metadata.xml delete mode 100644 gnome-extra/file-browser-applet/Manifest delete mode 100644 gnome-extra/file-browser-applet/file-browser-applet-0.6.7.ebuild delete mode 100644 gnome-extra/file-browser-applet/metadata.xml delete mode 100644 gnome-extra/gcalctool/Manifest delete mode 100644 gnome-extra/gcalctool/files/gcalctool-5.32.2-missing-header.patch delete mode 100644 gnome-extra/gcalctool/gcalctool-5.32.2.ebuild delete mode 100644 gnome-extra/gcalctool/gcalctool-6.6.2.ebuild delete mode 100644 gnome-extra/gcalctool/metadata.xml delete mode 100644 gnome-extra/gconf-editor/gconf-editor-2.32.0.ebuild delete mode 100644 gnome-extra/gnome-audio/Manifest delete mode 100644 gnome-extra/gnome-audio/gnome-audio-2.22.2.ebuild delete mode 100644 gnome-extra/gnome-audio/metadata.xml delete mode 100644 gnome-extra/gnome-color-manager/files/gnome-color-manager-2.32.0-libnotify-0.7.patch delete mode 100644 gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild delete mode 100644 gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild delete mode 100644 gnome-extra/gnome-games-extra-data/Manifest delete mode 100644 gnome-extra/gnome-games-extra-data/gnome-games-extra-data-2.26.0.ebuild delete mode 100644 gnome-extra/gnome-games-extra-data/gnome-games-extra-data-2.30.0.ebuild delete mode 100644 gnome-extra/gnome-games-extra-data/metadata.xml delete mode 100644 gnome-extra/gnome-games/Manifest delete mode 100644 gnome-extra/gnome-games/files/gnome-games-2.26.3-gtali-invalid-pointer.patch delete mode 100644 gnome-extra/gnome-games/files/gnome-games-2.26.3-implicit-declaration.patch delete mode 100644 gnome-extra/gnome-games/files/gnome-games-2.28.1-conflicting-types-libgames-support.patch delete mode 100644 gnome-extra/gnome-games/files/gnome-games-2.28.2-automake.patch delete mode 100644 gnome-extra/gnome-games/files/gnome-games-2.28.2-underlinking.patch delete mode 100644 gnome-extra/gnome-games/files/gnome-games-2.28.2-zlib.patch delete mode 100644 gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch delete mode 100644 gnome-extra/gnome-games/files/gnome-games-fix-staging-games.patch delete mode 100644 gnome-extra/gnome-games/gnome-games-2.28.2.ebuild delete mode 100644 gnome-extra/gnome-games/metadata.xml delete mode 100644 gnome-extra/gnome-hdaps-applet/Manifest delete mode 100644 gnome-extra/gnome-hdaps-applet/files/gnome-hdaps-applet-20081204-include-and-unused.patch delete mode 100644 gnome-extra/gnome-hdaps-applet/gnome-hdaps-applet-20081204.ebuild delete mode 100644 gnome-extra/gnome-hdaps-applet/metadata.xml delete mode 100644 gnome-extra/gnome-media/Manifest delete mode 100644 gnome-extra/gnome-media/files/gnome-media-2.30.0-lamemp3enc.patch delete mode 100644 gnome-extra/gnome-media/files/gnome-media-2.30.0-microphone-icon.patch delete mode 100644 gnome-extra/gnome-media/files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch delete mode 100644 gnome-extra/gnome-media/files/gnome-media-2.32.0-gvc-channel.patch delete mode 100644 gnome-extra/gnome-media/gnome-media-2.32.0-r1.ebuild delete mode 100644 gnome-extra/gnome-media/gnome-media-2.32.0-r300.ebuild delete mode 100644 gnome-extra/gnome-media/gnome-media-3.4.0.ebuild delete mode 100644 gnome-extra/gnome-media/metadata.xml delete mode 100644 gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-close-fd.patch delete mode 100644 gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-convert-percentage.patch delete mode 100644 gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-duplicated-battery.patch delete mode 100644 gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-libnotify-0.7.patch delete mode 100644 gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-no-xfce.patch delete mode 100644 gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-xbacklight-crash.patch delete mode 100644 gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild delete mode 100644 gnome-extra/gnome-screensaver/Manifest delete mode 100644 gnome-extra/gnome-screensaver/files/gentoologo-floaters.desktop delete mode 100644 gnome-extra/gnome-screensaver/files/gnome-screensaver-2.30.2-libnotify-0.7.patch delete mode 100644 gnome-extra/gnome-screensaver/files/gnome-screensaver-2.30.2-libxklavier-configure.patch delete mode 100644 gnome-extra/gnome-screensaver/files/gnome-screensaver-2.30.2-name-manager.patch delete mode 100644 gnome-extra/gnome-screensaver/files/gnome-screensaver-2.30.2-nvidia-fade.patch delete mode 100644 gnome-extra/gnome-screensaver/files/gnome-screensaver-2.30.2-nvidia-fade2.patch delete mode 100644 gnome-extra/gnome-screensaver/files/gnome-screensaver-2.30.2-popsquares-header.patch delete mode 100644 gnome-extra/gnome-screensaver/files/gnome-screensaver-2.30.2-prevent-twice.patch delete mode 100644 gnome-extra/gnome-screensaver/files/xss-conversion-2.txt delete mode 100644 gnome-extra/gnome-screensaver/gnome-screensaver-2.30.2-r1.ebuild delete mode 100644 gnome-extra/gnome-screensaver/gnome-screensaver-3.6.1.ebuild delete mode 100644 gnome-extra/gnome-screensaver/metadata.xml delete mode 100644 gnome-extra/gnome-swallow/Manifest delete mode 100644 gnome-extra/gnome-swallow/files/gnome-swallow-1.2-as-needed.patch delete mode 100644 gnome-extra/gnome-swallow/files/gnome-swallow-1.2-libgnomeui-flags.patch delete mode 100644 gnome-extra/gnome-swallow/files/gnome-swallow-1.2-qa-warning.patch delete mode 100644 gnome-extra/gnome-swallow/gnome-swallow-1.2.ebuild delete mode 100644 gnome-extra/gnome-swallow/metadata.xml delete mode 100644 gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.28.2-gmodule.patch delete mode 100644 gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.8.2.1-fix-grid-display.patch delete mode 100644 gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild delete mode 100644 gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.2.ebuild delete mode 100644 gnome-extra/gnome-user-docs/gnome-user-docs-2.32.0.ebuild delete mode 100644 gnome-extra/gnome-user-docs/gnome-user-docs-3.10.3.ebuild delete mode 100644 gnome-extra/gnome-user-share/files/gnome-user-share-2.30.1-libnotify-0.7.patch delete mode 100644 gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild delete mode 100644 gnome-extra/gnome-utils/files/gnome-utils-2.32.0-fix-uninitialized.patch delete mode 100644 gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons.patch delete mode 100644 gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons2.patch delete mode 100644 gnome-extra/gnome-utils/files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch delete mode 100644 gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild delete mode 100644 gnome-extra/gtkhtml/files/gtkhtml-3.32.2-g_thread_init.patch delete mode 100644 gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild delete mode 100644 gnome-extra/gtkhtml/gtkhtml-4.8.4.ebuild delete mode 100644 gnome-extra/hamster-applet/Manifest delete mode 100644 gnome-extra/hamster-applet/files/hamster-applet-2.32.1-fix-edit.patch delete mode 100644 gnome-extra/hamster-applet/hamster-applet-2.32.1-r1.ebuild delete mode 100644 gnome-extra/hamster-applet/hamster-applet-2.32.1.ebuild delete mode 100644 gnome-extra/hamster-applet/metadata.xml delete mode 100644 gnome-extra/libgail-gnome/Manifest delete mode 100644 gnome-extra/libgail-gnome/libgail-gnome-1.20.4.ebuild delete mode 100644 gnome-extra/libgail-gnome/metadata.xml delete mode 100644 gnome-extra/libgda/files/libgda-4.99.1-gda-browser-help-collision.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.99.4-disable-broken-tests.patch delete mode 100644 gnome-extra/libgda/files/libgda-4.99.4-statement-rewriting-fix.patch delete mode 100644 gnome-extra/libgda/files/libgda-5.0.3-custom.vala delete mode 100644 gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch delete mode 100644 gnome-extra/libgda/libgda-4.2.13.ebuild delete mode 100644 gnome-extra/lock-keys-applet/Manifest delete mode 100644 gnome-extra/lock-keys-applet/lock-keys-applet-1.0.ebuild delete mode 100644 gnome-extra/lock-keys-applet/metadata.xml delete mode 100644 gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild delete mode 100644 gnome-extra/mousetweaks/mousetweaks-3.10.0.ebuild delete mode 100644 gnome-extra/nautilus-actions/nautilus-actions-3.2.2-r200.ebuild delete mode 100644 gnome-extra/nautilus-open-terminal/Manifest delete mode 100644 gnome-extra/nautilus-open-terminal/metadata.xml delete mode 100644 gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.20.ebuild delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-gseal-enable.patch delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-item-focus.patch delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-empathy.patch delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-old-evo.patch delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-shadowed-mounts.patch delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-thunderbird-command.patch delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-dbus.patch delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-init.patch delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload.patch delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch delete mode 100644 gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch delete mode 100644 gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild delete mode 100644 gnome-extra/nemo/nemo-1.8.5.ebuild delete mode 100644 gnome-extra/panflute/Manifest delete mode 100644 gnome-extra/panflute/files/panflute-0.6.2-libnotify-0.7.patch delete mode 100644 gnome-extra/panflute/metadata.xml delete mode 100644 gnome-extra/panflute/panflute-0.7.0.ebuild delete mode 100644 gnome-extra/sensors-applet/Manifest delete mode 100644 gnome-extra/sensors-applet/files/sensors-applet-2.2.7-libnotify-0.7.patch delete mode 100644 gnome-extra/sensors-applet/files/sensors-applet-2.2.7-underlinking.patch delete mode 100644 gnome-extra/sensors-applet/metadata.xml delete mode 100644 gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild delete mode 100644 gnome-extra/sensors-applet/sensors-applet-3.0.0.ebuild delete mode 100644 gnome-extra/swfdec-gnome/Manifest delete mode 100644 gnome-extra/swfdec-gnome/metadata.xml delete mode 100644 gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.ebuild delete mode 100644 gnome-extra/tasks/Manifest delete mode 100644 gnome-extra/tasks/files/tasks-0.14-configh.patch delete mode 100644 gnome-extra/tasks/files/tasks-0.16-asneeded.patch delete mode 100644 gnome-extra/tasks/metadata.xml delete mode 100644 gnome-extra/tasks/tasks-0.20.ebuild delete mode 100644 gnome-extra/yelp/files/yelp-2.30.2-freeze-move.patch delete mode 100644 gnome-extra/yelp/files/yelp-2.30.2-gthread.patch delete mode 100644 gnome-extra/yelp/files/yelp-2.30.2-print-crash.patch delete mode 100644 gnome-extra/yelp/files/yelp-2.30.2-uri-handler.patch delete mode 100644 gnome-extra/yelp/files/yelp-2.30.2-xz-support.patch delete mode 100644 gnome-extra/yelp/yelp-2.30.2-r200.ebuild delete mode 100644 gnome-extra/yelp/yelp-3.10.2.ebuild delete mode 100644 gnome-extra/zenity/files/zenity-2.32.1-libnotify-0.7.patch delete mode 100644 gnome-extra/zenity/files/zenity-3.8.0-broken-autoclose.patch delete mode 100644 gnome-extra/zenity/files/zenity-3.8.0-double-click.patch delete mode 100644 gnome-extra/zenity/files/zenity-3.8.0-listbox-expand.patch delete mode 100644 gnome-extra/zenity/zenity-2.32.1.ebuild delete mode 100644 gnome-extra/zenity/zenity-3.8.0-r2.ebuild delete mode 100644 mail-client/balsa/balsa-2.4.13.ebuild delete mode 100644 mail-client/evolution/evolution-2.32.3-r1.ebuild delete mode 100644 mail-client/evolution/evolution-3.12.7.ebuild delete mode 100644 mail-client/evolution/files/evolution-2.32.0-wrong-lafile-usage.patch delete mode 100644 mail-client/evolution/files/evolution-2.32.1-libnotify-0.7.patch delete mode 100644 mail-client/evolution/files/evolution-2.32.2-mime-handler.patch delete mode 100644 mail-client/evolution/files/evolution-2.32.2-smime-fix.patch delete mode 100644 mail-client/evolution/files/evolution-2.32.3-g_thread_init.patch delete mode 100644 mail-client/evolution/files/evolution-2.32.3-gmodule-explicit.patch delete mode 100644 mail-client/evolution/files/evolution-2.32.3-libxml2-2.9.patch delete mode 100644 media-gfx/byzanz/Manifest delete mode 100644 media-gfx/byzanz/byzanz-0.2.3.ebuild delete mode 100644 media-gfx/byzanz/metadata.xml delete mode 100644 media-gfx/eog/eog-2.32.1.ebuild delete mode 100644 media-gfx/eog/eog-3.10.2.ebuild delete mode 100644 media-gfx/eog/eog-3.12.1.ebuild delete mode 100644 media-gfx/eog/files/eog-2.32.1-gmodule.patch delete mode 100644 media-gfx/shared-color-profiles/Manifest delete mode 100644 media-gfx/shared-color-profiles/metadata.xml delete mode 100644 media-gfx/shared-color-profiles/shared-color-profiles-0.1.5.ebuild delete mode 100644 media-libs/gupnp-dlna/gupnp-dlna-0.6.6.ebuild delete mode 100644 media-libs/swfdec/Manifest delete mode 100644 media-libs/swfdec/metadata.xml delete mode 100644 media-libs/swfdec/swfdec-0.8.4.ebuild delete mode 100644 media-sound/pulseaudio/pulseaudio-2.1-r1.ebuild delete mode 100644 media-sound/pulseaudio/pulseaudio-4.0.ebuild delete mode 100644 media-sound/sound-juicer/files/sound-juicer-2.28.2-fix-pause-conflict.patch delete mode 100644 media-sound/sound-juicer/files/sound-juicer-2.32.0-desktop-file.patch delete mode 100644 media-sound/sound-juicer/sound-juicer-2.32.0-r1.ebuild delete mode 100644 media-sound/sound-juicer/sound-juicer-3.11.90.ebuild delete mode 100644 media-sound/sound-juicer/sound-juicer-3.5.1_pre20130826.ebuild delete mode 100644 media-video/cheese/cheese-2.32.0.ebuild delete mode 100644 media-video/cheese/cheese-3.10.2.ebuild delete mode 100644 media-video/gxine/gxine-0.5.907.ebuild delete mode 100644 media-video/totem/files/totem-2.30.2-mp2t-support.patch delete mode 100644 media-video/totem/files/totem-2.32.0-smclient-target-detection.patch delete mode 100644 media-video/totem/totem-2.32.0-r2.ebuild delete mode 100644 metadata/md5-cache/app-accessibility/dasher-4.11 delete mode 100644 metadata/md5-cache/app-accessibility/java-access-bridge-1.26.2 delete mode 100644 metadata/md5-cache/app-accessibility/morseall-0.5.0 delete mode 100644 metadata/md5-cache/app-admin/system-config-printer-common-1.3.12 delete mode 100644 metadata/md5-cache/app-admin/system-config-printer-common-1.3.13 delete mode 100644 metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.12 delete mode 100644 metadata/md5-cache/app-admin/system-config-printer-gnome-1.3.13 delete mode 100644 metadata/md5-cache/app-dicts/verbiste-0.1.38 delete mode 100644 metadata/md5-cache/app-editors/emacs-vcs-24.4.9999-r1 delete mode 100644 metadata/md5-cache/app-editors/emacs-vcs-25.0.9999 delete mode 100644 metadata/md5-cache/app-i18n/im-ja-1.5-r2 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.7.3 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.7.3-r1 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.8.0 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.8.0-r1 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.8.2 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.8.2-r1 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.8.3 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.8.3-r1 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.8.4 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.8.4-r1 delete mode 100644 metadata/md5-cache/app-i18n/uim-1.8.6 delete mode 100644 metadata/md5-cache/dev-dotnet/gtkhtml-sharp-2.26.0 delete mode 100644 metadata/md5-cache/dev-libs/libgdata-0.16.0 delete mode 100644 metadata/md5-cache/dev-libs/libgdata-0.8.1-r2 delete mode 100644 metadata/md5-cache/dev-libs/libgweather-2.30.3 delete mode 100644 metadata/md5-cache/dev-python/brasero-python-2.32.0 delete mode 100644 metadata/md5-cache/dev-python/brasero-python-2.32.0-r1 delete mode 100644 metadata/md5-cache/dev-python/bug-buddy-python-2.32.0 delete mode 100644 metadata/md5-cache/dev-python/bug-buddy-python-2.32.0-r1 delete mode 100644 metadata/md5-cache/dev-python/evince-python-2.32.0 delete mode 100644 metadata/md5-cache/dev-python/evince-python-2.32.0-r1 delete mode 100644 metadata/md5-cache/dev-python/evolution-python-2.32.0 delete mode 100644 metadata/md5-cache/dev-python/evolution-python-2.32.0-r1 delete mode 100644 metadata/md5-cache/dev-python/gnome-applets-python-2.32.0 delete mode 100644 metadata/md5-cache/dev-python/gnome-applets-python-2.32.0-r1 delete mode 100644 metadata/md5-cache/dev-python/gnome-desktop-python-2.32.0 delete mode 100644 metadata/md5-cache/dev-python/gnome-desktop-python-2.32.0-r1 delete mode 100644 metadata/md5-cache/dev-python/gnome-media-python-2.32.0 delete mode 100644 metadata/md5-cache/dev-python/gnome-media-python-2.32.0-r1 create mode 100644 metadata/md5-cache/dev-python/gns3-gui-1.1 delete mode 100644 metadata/md5-cache/dev-python/libgda-python-2.25.3 delete mode 100644 metadata/md5-cache/dev-python/libgda-python-2.25.3-r1 delete mode 100644 metadata/md5-cache/dev-python/libgksu-python-2.25.3 delete mode 100644 metadata/md5-cache/dev-python/libgksu-python-2.25.3-r1 delete mode 100644 metadata/md5-cache/dev-python/libgnomeprint-python-2.32.0 delete mode 100644 metadata/md5-cache/dev-python/libgnomeprint-python-2.32.0-r1 delete mode 100644 metadata/md5-cache/dev-python/libgtop-python-2.32.0 delete mode 100644 metadata/md5-cache/dev-python/libgtop-python-2.32.0-r1 delete mode 100644 metadata/md5-cache/dev-python/nautilus-python-0.7.3 delete mode 100644 metadata/md5-cache/dev-python/totem-python-2.32.0 delete mode 100644 metadata/md5-cache/dev-python/totem-python-2.32.0-r1 delete mode 100644 metadata/md5-cache/dev-util/mono-tools-2.10 delete mode 100644 metadata/md5-cache/dev-vcs/bzr-gtk-0.100.0 delete mode 100644 metadata/md5-cache/dev-vcs/giggle-0.6.2 delete mode 100644 metadata/md5-cache/dev-vcs/giggle-0.7 delete mode 100644 metadata/md5-cache/gnome-base/gconf-2.32.4-r1 delete mode 100644 metadata/md5-cache/gnome-base/gconf-3.2.6-r1 delete mode 100644 metadata/md5-cache/gnome-base/gconf-3.2.6-r2 delete mode 100644 metadata/md5-cache/gnome-base/gdm-2.20.11-r1 delete mode 100644 metadata/md5-cache/gnome-base/gnome-2.32.1-r2 delete mode 100644 metadata/md5-cache/gnome-base/gnome-3.10.0 delete mode 100644 metadata/md5-cache/gnome-base/gnome-applets-2.32.1.1-r2 delete mode 100644 metadata/md5-cache/gnome-base/gnome-control-center-2.32.1-r1 delete mode 100644 metadata/md5-cache/gnome-base/gnome-fallback-3.6.2 delete mode 100644 metadata/md5-cache/gnome-base/gnome-fallback-3.8.0 delete mode 100644 metadata/md5-cache/gnome-base/gnome-keyring-2.32.1-r1 delete mode 100644 metadata/md5-cache/gnome-base/gnome-keyring-3.10.1 delete mode 100644 metadata/md5-cache/gnome-base/gnome-keyring-3.12.0 delete mode 100644 metadata/md5-cache/gnome-base/gnome-keyring-3.12.2 delete mode 100644 metadata/md5-cache/gnome-base/gnome-light-2.32.1-r2 delete mode 100644 metadata/md5-cache/gnome-base/gnome-light-3.10.0 delete mode 100644 metadata/md5-cache/gnome-base/gnome-menus-2.30.5-r1 delete mode 100644 metadata/md5-cache/gnome-base/gnome-menus-3.0.1-r2 delete mode 100644 metadata/md5-cache/gnome-base/gnome-menus-3.10.1 delete mode 100644 metadata/md5-cache/gnome-base/gnome-panel-2.32.1-r3 delete mode 100644 metadata/md5-cache/gnome-base/gnome-panel-3.8.0-r1 delete mode 100644 metadata/md5-cache/gnome-base/gnome-session-2.32.1-r3 delete mode 100644 metadata/md5-cache/gnome-base/gnome-settings-daemon-2.32.1-r2 delete mode 100644 metadata/md5-cache/gnome-base/libgnome-keyring-2.32.0 delete mode 100644 metadata/md5-cache/gnome-base/libgnomekbd-2.32.0-r1 delete mode 100644 metadata/md5-cache/gnome-base/nautilus-2.32.2.1-r2 delete mode 100644 metadata/md5-cache/gnome-base/nautilus-3.10.1 delete mode 100644 metadata/md5-cache/gnome-base/nautilus-3.12.0 delete mode 100644 metadata/md5-cache/gnome-extra/at-spi-1.32.0-r2 delete mode 100644 metadata/md5-cache/gnome-extra/at-spi-2.8.0 delete mode 100644 metadata/md5-cache/gnome-extra/bug-buddy-2.32.0-r2 delete mode 100644 metadata/md5-cache/gnome-extra/cinnamon-2.2.16-r1 delete mode 100644 metadata/md5-cache/gnome-extra/deskbar-applet-2.32.0 delete mode 100644 metadata/md5-cache/gnome-extra/evolution-data-server-2.32.3-r3 delete mode 100644 metadata/md5-cache/gnome-extra/evolution-data-server-3.12.7.1 delete mode 100644 metadata/md5-cache/gnome-extra/evolution-exchange-2.32.3 delete mode 100644 metadata/md5-cache/gnome-extra/evolution-webcal-2.32.0 delete mode 100644 metadata/md5-cache/gnome-extra/fast-user-switch-applet-2.24.0 delete mode 100644 metadata/md5-cache/gnome-extra/file-browser-applet-0.6.7 delete mode 100644 metadata/md5-cache/gnome-extra/gcalctool-5.32.2 delete mode 100644 metadata/md5-cache/gnome-extra/gcalctool-6.6.2 delete mode 100644 metadata/md5-cache/gnome-extra/gconf-editor-2.32.0 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-audio-2.22.2 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-color-manager-2.32.0 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-color-manager-3.10.1 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-games-2.28.2 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-games-extra-data-2.26.0 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-games-extra-data-2.30.0 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-hdaps-applet-20081204 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-media-2.32.0-r1 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-media-2.32.0-r300 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-media-3.4.0 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-power-manager-2.32.0-r3 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-screensaver-2.30.2-r1 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-screensaver-3.6.1 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-swallow-1.2 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-system-monitor-2.28.2-r1 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-system-monitor-3.10.2 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-user-docs-2.32.0 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-user-docs-3.10.3 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-user-share-2.30.1 delete mode 100644 metadata/md5-cache/gnome-extra/gnome-utils-2.32.0-r2 delete mode 100644 metadata/md5-cache/gnome-extra/gtkhtml-3.32.2 delete mode 100644 metadata/md5-cache/gnome-extra/gtkhtml-4.8.4 delete mode 100644 metadata/md5-cache/gnome-extra/hamster-applet-2.32.1 delete mode 100644 metadata/md5-cache/gnome-extra/hamster-applet-2.32.1-r1 delete mode 100644 metadata/md5-cache/gnome-extra/libgail-gnome-1.20.4 delete mode 100644 metadata/md5-cache/gnome-extra/libgda-4.2.13 delete mode 100644 metadata/md5-cache/gnome-extra/lock-keys-applet-1.0 delete mode 100644 metadata/md5-cache/gnome-extra/mousetweaks-2.32.1 delete mode 100644 metadata/md5-cache/gnome-extra/mousetweaks-3.10.0 delete mode 100644 metadata/md5-cache/gnome-extra/nautilus-actions-3.2.2-r200 delete mode 100644 metadata/md5-cache/gnome-extra/nautilus-open-terminal-0.20 delete mode 100644 metadata/md5-cache/gnome-extra/nautilus-sendto-2.32.0 delete mode 100644 metadata/md5-cache/gnome-extra/nemo-1.8.5 delete mode 100644 metadata/md5-cache/gnome-extra/panflute-0.7.0 delete mode 100644 metadata/md5-cache/gnome-extra/sensors-applet-2.2.7-r1 delete mode 100644 metadata/md5-cache/gnome-extra/sensors-applet-3.0.0 delete mode 100644 metadata/md5-cache/gnome-extra/swfdec-gnome-2.30.1 delete mode 100644 metadata/md5-cache/gnome-extra/tasks-0.20 delete mode 100644 metadata/md5-cache/gnome-extra/yelp-2.30.2-r200 delete mode 100644 metadata/md5-cache/gnome-extra/yelp-3.10.2 delete mode 100644 metadata/md5-cache/gnome-extra/zenity-2.32.1 delete mode 100644 metadata/md5-cache/gnome-extra/zenity-3.8.0-r2 delete mode 100644 metadata/md5-cache/mail-client/balsa-2.4.13 delete mode 100644 metadata/md5-cache/mail-client/evolution-2.32.3-r1 delete mode 100644 metadata/md5-cache/mail-client/evolution-3.12.7 delete mode 100644 metadata/md5-cache/media-gfx/byzanz-0.2.3 delete mode 100644 metadata/md5-cache/media-gfx/eog-2.32.1 delete mode 100644 metadata/md5-cache/media-gfx/eog-3.10.2 delete mode 100644 metadata/md5-cache/media-gfx/eog-3.12.1 delete mode 100644 metadata/md5-cache/media-gfx/shared-color-profiles-0.1.5 delete mode 100644 metadata/md5-cache/media-libs/gupnp-dlna-0.6.6 delete mode 100644 metadata/md5-cache/media-libs/swfdec-0.8.4 delete mode 100644 metadata/md5-cache/media-sound/pulseaudio-2.1-r1 delete mode 100644 metadata/md5-cache/media-sound/pulseaudio-4.0 delete mode 100644 metadata/md5-cache/media-sound/sound-juicer-2.32.0-r1 delete mode 100644 metadata/md5-cache/media-sound/sound-juicer-3.11.90 delete mode 100644 metadata/md5-cache/media-sound/sound-juicer-3.5.1_pre20130826 delete mode 100644 metadata/md5-cache/media-video/cheese-2.32.0 delete mode 100644 metadata/md5-cache/media-video/cheese-3.10.2 delete mode 100644 metadata/md5-cache/media-video/gxine-0.5.907 delete mode 100644 metadata/md5-cache/media-video/totem-2.32.0-r2 delete mode 100644 metadata/md5-cache/net-analyzer/gnome-netstatus-2.28.2 delete mode 100644 metadata/md5-cache/net-analyzer/gnome-nettool-2.32.0 delete mode 100644 metadata/md5-cache/net-analyzer/netspeed_applet-0.16 delete mode 100644 metadata/md5-cache/net-im/empathy-2.34.0-r2 delete mode 100644 metadata/md5-cache/net-im/empathy-3.12.6 delete mode 100644 metadata/md5-cache/net-im/telepathy-logger-0.4.0-r1 delete mode 100644 metadata/md5-cache/net-im/telepathy-logger-0.6.0 delete mode 100644 metadata/md5-cache/net-im/telepathy-mission-control-5.14.0-r1 delete mode 100644 metadata/md5-cache/net-im/telepathy-mission-control-5.14.1 delete mode 100644 metadata/md5-cache/net-libs/farsight2-0.0.31 delete mode 100644 metadata/md5-cache/net-libs/gtk-vnc-0.5.2 delete mode 100644 metadata/md5-cache/net-libs/gupnp-vala-0.10.5 delete mode 100644 metadata/md5-cache/net-libs/libepc-0.4.4 delete mode 100644 metadata/md5-cache/net-mail/gnubiff-2.2.13-r2 delete mode 100644 metadata/md5-cache/net-mail/gnubiff-2.2.13-r3 delete mode 100644 metadata/md5-cache/net-mail/gnubiff-2.2.15 delete mode 100644 metadata/md5-cache/net-mail/gnubiff-2.2.15-r1 delete mode 100644 metadata/md5-cache/net-misc/blogtk-2.0-r1 delete mode 100644 metadata/md5-cache/net-misc/drivel-3.0.5 delete mode 100644 metadata/md5-cache/net-misc/gnome-blog-0.9.2 delete mode 100644 metadata/md5-cache/net-misc/tsclient-2.0.1-r1 delete mode 100644 metadata/md5-cache/net-misc/vinagre-2.30.3 delete mode 100644 metadata/md5-cache/net-misc/vino-2.32.2-r2 delete mode 100644 metadata/md5-cache/net-misc/youtube-dl-2014.11.12 rename metadata/md5-cache/net-misc/{youtube-dl-2014.11.09 => youtube-dl-2014.11.13} (95%) delete mode 100644 metadata/md5-cache/net-voip/telepathy-gabble-0.16.6 delete mode 100644 metadata/md5-cache/net-voip/telepathy-gabble-0.18.2 delete mode 100644 metadata/md5-cache/net-voip/telepathy-haze-0.6.0 delete mode 100644 metadata/md5-cache/net-voip/telepathy-rakia-0.7.4 delete mode 100644 metadata/md5-cache/net-wireless/gnome-bluetooth-2.32.0-r1 delete mode 100644 metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r201 delete mode 100644 metadata/md5-cache/sys-apps/gnome-disk-utility-3.10.0 delete mode 100644 metadata/md5-cache/www-client/epiphany-2.30.6-r1 delete mode 100644 metadata/md5-cache/www-client/epiphany-extensions-2.32.0-r1 delete mode 100644 metadata/md5-cache/www-plugins/adobe-flash-11.2.202.411 delete mode 100644 metadata/md5-cache/www-plugins/swfdec-mozilla-0.8.2-r1 delete mode 100644 metadata/md5-cache/x11-misc/alacarte-0.13.2 delete mode 100644 metadata/md5-cache/x11-misc/glunarclock-0.34.1 delete mode 100644 metadata/md5-cache/x11-plugins/wmlife-1.0.1 delete mode 100644 metadata/md5-cache/x11-terms/gnome-terminal-2.32.1-r1 delete mode 100644 metadata/md5-cache/x11-terms/gnome-terminal-3.10.2 delete mode 100644 metadata/md5-cache/x11-terms/gnome-terminal-3.12.2 delete mode 100644 metadata/md5-cache/x11-themes/gnome-backgrounds-2.32.0 delete mode 100644 metadata/md5-cache/x11-themes/gnome-backgrounds-3.10.1 delete mode 100644 metadata/md5-cache/x11-themes/gnome-backgrounds-3.12.1 delete mode 100644 metadata/md5-cache/x11-themes/gnome-icon-theme-3.10.0 delete mode 100644 metadata/md5-cache/x11-themes/gnome-icon-theme-3.6.2 delete mode 100644 metadata/md5-cache/x11-themes/gnome-themes-2.32.1-r1 delete mode 100644 metadata/md5-cache/x11-themes/gnome-themes-extras-2.22.0-r1 delete mode 100644 metadata/md5-cache/x11-themes/gtk-engines-cleanice-2.4.1 delete mode 100644 metadata/md5-cache/x11-themes/gtk-engines-dwerg-0.8 delete mode 100644 net-analyzer/gnome-netstatus/Manifest delete mode 100644 net-analyzer/gnome-netstatus/files/gnome-netstatus-2.12.1-fix-iflist.patch delete mode 100644 net-analyzer/gnome-netstatus/gnome-netstatus-2.28.2.ebuild delete mode 100644 net-analyzer/gnome-netstatus/metadata.xml delete mode 100644 net-analyzer/gnome-nettool/files/gnome-nettool-2.18.0-fbsd.patch delete mode 100644 net-analyzer/gnome-nettool/files/gnome-nettool-3.2.0-extra-path.patch delete mode 100644 net-analyzer/gnome-nettool/gnome-nettool-2.32.0.ebuild delete mode 100644 net-analyzer/netspeed_applet/Manifest delete mode 100644 net-analyzer/netspeed_applet/metadata.xml delete mode 100644 net-analyzer/netspeed_applet/netspeed_applet-0.16.ebuild delete mode 100644 net-im/empathy/empathy-2.34.0-r2.ebuild delete mode 100644 net-im/empathy/empathy-3.12.6.ebuild delete mode 100644 net-im/empathy/files/empathy-2.34.0-CVE-2011-3635.patch delete mode 100644 net-im/empathy/files/empathy-2.34.0-auth-dialog-crash-fix.patch delete mode 100644 net-im/empathy/files/empathy-2.34.0-missing-include.patch delete mode 100644 net-im/telepathy-logger/telepathy-logger-0.4.0-r1.ebuild delete mode 100644 net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild delete mode 100644 net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild delete mode 100644 net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild delete mode 100644 net-libs/farsight2/Manifest delete mode 100644 net-libs/farsight2/farsight2-0.0.31.ebuild delete mode 100644 net-libs/farsight2/files/farsight2-0.0.20-make-382.patch delete mode 100644 net-libs/farsight2/metadata.xml delete mode 100644 net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pod.patch delete mode 100644 net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pulseaudio-automagic.patch delete mode 100644 net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild delete mode 100644 net-libs/gupnp-vala/Manifest delete mode 100644 net-libs/gupnp-vala/gupnp-vala-0.10.5.ebuild delete mode 100644 net-libs/gupnp-vala/metadata.xml delete mode 100644 net-libs/libepc/Manifest delete mode 100644 net-libs/libepc/libepc-0.4.4.ebuild delete mode 100644 net-libs/libepc/metadata.xml delete mode 100644 net-mail/gnubiff/files/gnubiff-2.2.13-fix-nls.patch delete mode 100644 net-mail/gnubiff/files/gnubiff-2.2.13-gold.patch delete mode 100644 net-mail/gnubiff/gnubiff-2.2.13-r2.ebuild delete mode 100644 net-mail/gnubiff/gnubiff-2.2.13-r3.ebuild delete mode 100644 net-mail/gnubiff/gnubiff-2.2.15-r1.ebuild delete mode 100644 net-mail/gnubiff/gnubiff-2.2.15.ebuild delete mode 100644 net-misc/blogtk/Manifest delete mode 100644 net-misc/blogtk/blogtk-2.0-r1.ebuild delete mode 100644 net-misc/blogtk/files/blogtk-2.0-destdir.patch delete mode 100644 net-misc/blogtk/metadata.xml delete mode 100644 net-misc/drivel/Manifest delete mode 100644 net-misc/drivel/drivel-3.0.5.ebuild delete mode 100644 net-misc/drivel/metadata.xml delete mode 100644 net-misc/gnome-blog/Manifest delete mode 100644 net-misc/gnome-blog/gnome-blog-0.9.2.ebuild delete mode 100644 net-misc/gnome-blog/metadata.xml delete mode 100644 net-misc/tsclient/Manifest delete mode 100644 net-misc/tsclient/files/tsclient-2.0.1-desktop-file.patch delete mode 100644 net-misc/tsclient/files/tsclient-2.0.1-glib-2.32.patch delete mode 100644 net-misc/tsclient/files/tsclient-2.0.1-libnotify-0.7.patch delete mode 100644 net-misc/tsclient/files/tsclient-2.0.1-no-networkmanager.patch delete mode 100644 net-misc/tsclient/metadata.xml delete mode 100644 net-misc/tsclient/tsclient-2.0.1-r1.ebuild delete mode 100644 net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch delete mode 100644 net-misc/vinagre/vinagre-2.30.3.ebuild delete mode 100644 net-misc/vino/files/vino-2.26.2-autorestart-loop.patch delete mode 100644 net-misc/vino/files/vino-3.6.2-clipboard-leak.patch delete mode 100644 net-misc/vino/files/vino-3.8.1-new-client.patch delete mode 100644 net-misc/vino/vino-2.32.2-r2.ebuild delete mode 100644 net-misc/youtube-dl/youtube-dl-2014.11.09.ebuild rename net-misc/youtube-dl/{youtube-dl-2014.11.12.ebuild => youtube-dl-2014.11.13.ebuild} (96%) delete mode 100644 net-voip/telepathy-gabble/telepathy-gabble-0.16.6.ebuild delete mode 100644 net-voip/telepathy-gabble/telepathy-gabble-0.18.2.ebuild delete mode 100644 net-voip/telepathy-haze/telepathy-haze-0.6.0.ebuild delete mode 100644 net-voip/telepathy-rakia/files/telepathy-rakia-0.7.4-gio-linking.patch delete mode 100644 net-voip/telepathy-rakia/telepathy-rakia-0.7.4.ebuild delete mode 100644 net-wireless/gnome-bluetooth/files/80-rfkill.rules delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-introspection-build.patch delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-libnotify-0.7.patch delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-nsd-automagic.patch delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch delete mode 100644 net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch delete mode 100644 net-wireless/gnome-bluetooth/gnome-bluetooth-2.32.0-r1.ebuild create mode 100644 sci-calculators/orpie/files/orpie-1.5.1-tinfo.patch delete mode 100644 sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch delete mode 100644 sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch delete mode 100644 sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat-r201.patch delete mode 100644 sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat.patch delete mode 100644 sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-separate-libgdu.patch delete mode 100644 sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-kill-gsd-automagic.patch delete mode 100644 sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-raise-gsd-dependency.patch delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r201.ebuild delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild delete mode 100644 www-client/epiphany-extensions/Manifest delete mode 100644 www-client/epiphany-extensions/epiphany-extensions-2.32.0-r1.ebuild delete mode 100644 www-client/epiphany-extensions/metadata.xml delete mode 100644 www-client/epiphany/epiphany-2.30.6-r1.ebuild delete mode 100644 www-client/epiphany/files/epiphany-2.30.6-clearing-passwd.patch delete mode 100644 www-client/epiphany/files/epiphany-2.30.6-dbus-fix.patch delete mode 100644 www-client/epiphany/files/epiphany-2.30.6-introspection-prefix.patch delete mode 100644 www-client/epiphany/files/epiphany-2.30.6-libnotify-0.7.patch delete mode 100644 www-client/epiphany/files/epiphany-2.30.6-mime-handler.patch delete mode 100644 www-plugins/adobe-flash/adobe-flash-11.2.202.411.ebuild delete mode 100644 www-plugins/swfdec-mozilla/Manifest delete mode 100644 www-plugins/swfdec-mozilla/files/swfdec-mozilla-0.8.2-fix-crash.patch delete mode 100644 www-plugins/swfdec-mozilla/metadata.xml delete mode 100644 www-plugins/swfdec-mozilla/swfdec-mozilla-0.8.2-r1.ebuild delete mode 100644 x11-misc/alacarte/alacarte-0.13.2.ebuild delete mode 100644 x11-misc/glunarclock/Manifest delete mode 100644 x11-misc/glunarclock/glunarclock-0.34.1.ebuild delete mode 100644 x11-misc/glunarclock/metadata.xml delete mode 100644 x11-plugins/wmlife/Manifest delete mode 100644 x11-plugins/wmlife/files/wmlife-1.0.0-stringh.patch delete mode 100644 x11-plugins/wmlife/files/wmlife-1.0.1-configure.patch delete mode 100644 x11-plugins/wmlife/metadata.xml delete mode 100644 x11-plugins/wmlife/wmlife-1.0.1.ebuild delete mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.10.2-sys-wait.h.patch delete mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.12.0-appmenu-parameter.patch delete mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-no-gnome-doc-utils.patch delete mode 100644 x11-terms/gnome-terminal/files/gnome-terminal-3.6.1-window-resize.patch delete mode 100644 x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild delete mode 100644 x11-terms/gnome-terminal/gnome-terminal-3.10.2.ebuild delete mode 100644 x11-terms/gnome-terminal/gnome-terminal-3.12.2.ebuild delete mode 100644 x11-themes/gnome-backgrounds/gnome-backgrounds-2.32.0.ebuild delete mode 100644 x11-themes/gnome-backgrounds/gnome-backgrounds-3.10.1.ebuild delete mode 100644 x11-themes/gnome-backgrounds/gnome-backgrounds-3.12.1.ebuild delete mode 100644 x11-themes/gnome-icon-theme/files/gnome-icon-theme-2.91.7-update-cache.patch delete mode 100644 x11-themes/gnome-icon-theme/gnome-icon-theme-3.10.0.ebuild delete mode 100644 x11-themes/gnome-icon-theme/gnome-icon-theme-3.6.2.ebuild delete mode 100644 x11-themes/gnome-themes-extras/Manifest delete mode 100644 x11-themes/gnome-themes-extras/files/gnome-themes-extras-2.22.0-darklooks.patch delete mode 100644 x11-themes/gnome-themes-extras/gnome-themes-extras-2.22.0-r1.ebuild delete mode 100644 x11-themes/gnome-themes-extras/metadata.xml delete mode 100644 x11-themes/gnome-themes/Manifest delete mode 100644 x11-themes/gnome-themes/files/gnome-themes-2.24.3-bashism.patch delete mode 100644 x11-themes/gnome-themes/gnome-themes-2.32.1-r1.ebuild delete mode 100644 x11-themes/gnome-themes/metadata.xml delete mode 100644 x11-themes/gtk-engines-cleanice/Manifest delete mode 100644 x11-themes/gtk-engines-cleanice/files/cleanice-2-gtkrc delete mode 100644 x11-themes/gtk-engines-cleanice/gtk-engines-cleanice-2.4.1.ebuild delete mode 100644 x11-themes/gtk-engines-cleanice/metadata.xml delete mode 100644 x11-themes/gtk-engines-dwerg/Manifest delete mode 100644 x11-themes/gtk-engines-dwerg/gtk-engines-dwerg-0.8.ebuild delete mode 100644 x11-themes/gtk-engines-dwerg/metadata.xml diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest deleted file mode 100644 index 77f3591d38f3..000000000000 --- a/app-accessibility/dasher/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dasher-4.11.tar.bz2 8416734 SHA256 fb21cc4ef606e10a8e5deffebe8695a376eabb0766d7d1bdf80abc5f03f4fed2 SHA512 df17b7f5b30d7c9fd4cb814b3f86485d9e9411433177194ba9c772299e501cd5a5a89fab75f97743223b88aa1084d525706b96028a5562b25f1ccbe2a10a4d7c WHIRLPOOL 7b9084b3fe0d6e79f681db0cc39e35056c766191a6fda1b1dcc3cc849244ab053cd8ab214494b51a2ccde130ad7d7eb6c5efafadacf12b29f5193bc200ab8e40 diff --git a/app-accessibility/dasher/dasher-4.11.ebuild b/app-accessibility/dasher/dasher-4.11.ebuild deleted file mode 100644 index 8a9881f3b814..000000000000 --- a/app-accessibility/dasher/dasher-4.11.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-4.11.ebuild,v 1.13 2012/05/03 01:48:59 jdhore Exp $ - -EAPI="2" - -inherit gnome2 - -DESCRIPTION="A text entry interface, driven by continuous pointing gestures" -HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" - -IUSE="accessibility cairo gnome nls" - -# The package claims to support 'qte', but it hasn't been tested. -# Any patches from someone who can test it are welcome. -# -RDEPEND=">=dev-libs/glib-2.16:2 - dev-libs/expat - >=x11-libs/gtk+-2.6:2 - >=gnome-base/gconf-2:2 - x11-libs/libX11 - x11-libs/libXtst - accessibility? ( - app-accessibility/gnome-speech - >=gnome-base/libbonobo-2 - >=gnome-base/orbit-2 - >=gnome-base/libgnomeui-2 - gnome-extra/at-spi:1 - dev-libs/atk ) - cairo? ( >=x11-libs/gtk+-2.8:2 ) - gnome? ( - >=gnome-base/libgnome-2 - >=gnome-base/libgnomeui-2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-proto/xextproto - x11-proto/xproto - gnome? ( - >=app-text/gnome-doc-utils-0.3.2 - app-text/scrollkeeper ) - nls? ( >=dev-util/intltool-0.41 )" - -DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" - -pkg_setup() { - # we might want to support japanese and chinese input at some point - # --enable-japanese - # --enable-chinese - # --enable-tilt (tilt sensor support) - - G2CONF="${G2CONF} - --disable-scrollkeeper - --with-gvfs - $(use_enable accessibility a11y) - $(use_enable accessibility speech) - $(use_with cairo) - $(use_with gnome) - $(use_enable nls)" -} - -src_prepare() { - # configure.ac has a typo for AM_GCONF_SOURCE2 - # beware if adding src_prepare + eautoreconf - gnome2_src_prepare - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ - || die "sed 1 failed" -} diff --git a/app-accessibility/dasher/metadata.xml b/app-accessibility/dasher/metadata.xml deleted file mode 100644 index 5daee29e3a4b..000000000000 --- a/app-accessibility/dasher/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - gnome-accessibility - - Dasher is an information-efficient text-entry interface, driven by - natural continuous pointing gestures. Dasher is a competitive - text-entry system wherever a full-size keyboard cannot be used. - - - Dasherは天為と継続的なポインティングカーソルで使う - テキストエントリインタフェースです。Dasherは普通な - キーボードが使えない競争なテキストエントリシステムです。 - - diff --git a/app-accessibility/java-access-bridge/Manifest b/app-accessibility/java-access-bridge/Manifest deleted file mode 100644 index 3623910dfc81..000000000000 --- a/app-accessibility/java-access-bridge/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST java-access-bridge-1.26.2.tar.bz2 311663 SHA256 a0ede71f282c8dab9fecf60abdf6a45ffa3552a9dfe6533a55011cbc34f653d8 SHA512 a41856f39953da926d09bdf92acb5dc0917c2241075e81758a2c08ffe291df57a01e143b69b1874242c3dc12fe826ecc06b4eff3383eb271a066c245ff770d08 WHIRLPOOL 7c57694f70de3e5ba715d10046de7885962374bec90309e3568b75ec12dd8f8cc552d2c97f5cdd1b329131e5df62d79bb0825ed03721641604a946933bf12a50 diff --git a/app-accessibility/java-access-bridge/files/java-access-bridge-1.6.0-missingclasses.patch b/app-accessibility/java-access-bridge/files/java-access-bridge-1.6.0-missingclasses.patch deleted file mode 100644 index 286208ee6caf..000000000000 --- a/app-accessibility/java-access-bridge/files/java-access-bridge-1.6.0-missingclasses.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nur java-access-bridge-1.6.0/at-client/Makefile.am java-access-bridge-1.6.0_patched/at-client/Makefile.am ---- java-access-bridge-1.6.0/at-client/Makefile.am 2003-08-25 12:17:11.000000000 +0300 -+++ java-access-bridge-1.6.0_patched/at-client/Makefile.am 2009-01-28 21:05:46.000000000 +0200 -@@ -9,7 +9,7 @@ - - ../gnome-java-bridge.jar : jar-stamp $(JAVA_FILES) $(DEP_CLASSES) - touch ../jar-stamp -- $(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/*.class -+ $(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/ - - $(DEP_CLASSES) : - @(cd `dirname $@`; $(MAKE) ) -diff -Nur java-access-bridge-1.6.0/bridge/Makefile.am java-access-bridge-1.6.0_patched/bridge/Makefile.am ---- java-access-bridge-1.6.0/bridge/Makefile.am 2003-08-25 12:17:11.000000000 +0300 -+++ java-access-bridge-1.6.0_patched/bridge/Makefile.am 2009-01-28 21:05:57.000000000 +0200 -@@ -15,7 +15,7 @@ - - ../gnome-java-bridge.jar : jar-stamp $(JAVA_FILES) $(DEP_CLASSES) - touch ../jar-stamp -- $(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/*.class -+ $(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/ - - $(DEP_CLASSES) : - @(cd `dirname $@`; $(MAKE) ) -diff -Nur java-access-bridge-1.6.0/idlgen/Makefile.am java-access-bridge-1.6.0_patched/idlgen/Makefile.am ---- java-access-bridge-1.6.0/idlgen/Makefile.am 2003-05-06 11:51:38.000000000 +0300 -+++ java-access-bridge-1.6.0_patched/idlgen/Makefile.am 2009-01-28 21:07:12.000000000 +0200 -@@ -16,7 +16,7 @@ - - ../gnome-java-bridge.jar : org/GNOME/Accessibility/Accessible.class $(CLASSES) ../jar-stamp - touch ../jar-stamp -- $(JAR) cf ../gnome-java-bridge.jar org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class -+ $(JAR) cf ../gnome-java-bridge.jar org/GNOME/Bonobo/ org/GNOME/Accessibility/ - - all-local: org/GNOME/Accessibility/Accessible.class $(JARFILES) - -diff -Nur java-access-bridge-1.6.0/util/Makefile.am java-access-bridge-1.6.0_patched/util/Makefile.am ---- java-access-bridge-1.6.0/util/Makefile.am 2003-08-25 12:17:14.000000000 +0300 -+++ java-access-bridge-1.6.0_patched/util/Makefile.am 2009-01-28 21:08:22.000000000 +0200 -@@ -9,7 +9,7 @@ - - ../gnome-java-bridge.jar : jar-stamp $(JAVA_FILES) $(DEP_CLASSES) - touch ../jar-stamp -- $(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/*.class -+ $(JAR) uf ../gnome-java-bridge.jar org/GNOME/Accessibility/ - - $(DEP_CLASSES) : - @(cd `dirname $@`; $(MAKE) ) diff --git a/app-accessibility/java-access-bridge/java-access-bridge-1.26.2.ebuild b/app-accessibility/java-access-bridge/java-access-bridge-1.26.2.ebuild deleted file mode 100644 index 840d8a7d3597..000000000000 --- a/app-accessibility/java-access-bridge/java-access-bridge-1.26.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.26.2.ebuild,v 1.5 2012/12/08 21:40:27 ago Exp $ - -EAPI=4 -GNOME_TARBALL_SUFFIX="bz2" -GNOME2_LA_PUNT="yes" - -inherit java-pkg-2 gnome2 eutils autotools - -DESCRIPTION="Gnome Java Accessibility Bridge" -HOMEPAGE="https://live.gnome.org/Java%20Access%20Bridge/" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -COMMON_DEPEND=">=gnome-base/libbonobo-2 - >=gnome-extra/at-spi-1.7.10:1 - x11-apps/xprop" - -RDEPEND="$COMMON_DEPEND - >=virtual/jre-1.4" - -DEPEND="$COMMON_DEPEND - >=virtual/jdk-1.4 - virtual/pkgconfig" - -DOCS="AUTHORS ChangeLog NEWS README" - -src_prepare() { - java-pkg-2_src_prepare - epatch "${FILESDIR}"/${PN}-1.6.0-missingclasses.patch - eautoreconf -} - -pkg_setup() { - java-pkg-2_pkg_setup - G2CONF+="--disable-static - --with-java-home=${JDK_HOME}" -} - -src_configure() { - gnome2_src_configure -} - -src_compile() { - emake JAVAC="${JAVAC} ${JAVACFLAGS}" -} - -src_install() { - gnome2_src_install - - java-pkg_dojar "${D}"/usr/share/jar/*.jar - - insinto /usr/share/${PN} - doins "${D}"/usr/share/jar/*.properties - - rm -rf "${D}"/usr/share/jar -} - -pkg_preinst() { - java-pkg-2_pkg_preinst - gnome2_pkg_preinst -} - -pkg_postinst() { - elog - elog "To enable accessibility support with your java applications, you" - elog "have to enable CORBA traffic over IP. To do this, you may add the" - elog "following line to your /etc/orbitrc or ~/.orbitrc file:" - elog - elog " ORBIIOPIPv4=1" - elog -} diff --git a/app-accessibility/java-access-bridge/metadata.xml b/app-accessibility/java-access-bridge/metadata.xml deleted file mode 100644 index ece6be261221..000000000000 --- a/app-accessibility/java-access-bridge/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - -gnome-accessibility -java - diff --git a/app-accessibility/morseall/Manifest b/app-accessibility/morseall/Manifest deleted file mode 100644 index bb9464a51161..000000000000 --- a/app-accessibility/morseall/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST morseall-0.5.0.tar.gz 968063 SHA256 b60307679deb3c992ca7c8395ba59026be75bcca777a862590fec5d5b25f29a7 SHA512 4b5f413d6d726dadb9d1eafec504db473a6acff1d8f3845e0e70ccc25cd43b238e10026a987b3a0cdc8318c5259bf707764aa3a78e6f53bb2bffd713bf84aece WHIRLPOOL e58de8c23b11af65eaa507b7a8329178cf6251c0262b849106d987e252aca30a8a8604421401bd51ab96139959c1bf8f7234ac30cd5fcb89aad563bd52129b78 diff --git a/app-accessibility/morseall/metadata.xml b/app-accessibility/morseall/metadata.xml deleted file mode 100644 index b723de1dbba2..000000000000 --- a/app-accessibility/morseall/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -accessibility - diff --git a/app-accessibility/morseall/morseall-0.5.0.ebuild b/app-accessibility/morseall/morseall-0.5.0.ebuild deleted file mode 100644 index b643b1f83b11..000000000000 --- a/app-accessibility/morseall/morseall-0.5.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/morseall/morseall-0.5.0.ebuild,v 1.1 2011/09/01 21:07:23 neurogeek Exp $ - -EAPI="3" - -DESCRIPTION="Allows people who have limited mobility to control their computer using morse code" -HOMEPAGE="http://www.morseall.org/" -SRC_URI="http://pehr.net/software/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-amd64 ~x86" -IUSE="" - -DEPEND="gnome-extra/at-spi:1" -RDEPEND="${DEPEND}" - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - dodoc README ChangeLog NEWS TODO -} diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest index 9a85ed54e187..cd546ef48691 100644 --- a/app-admin/system-config-printer-common/Manifest +++ b/app-admin/system-config-printer-common/Manifest @@ -1,3 +1 @@ -DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599 -DIST system-config-printer-1.3.13.tar.xz 955636 SHA256 9a6a4fbf61b1aafa061674719321846665ee7a4e7ab96dd4747069b0927d12a6 SHA512 046501d17c33a2ff72020b3d20210c5544c6310469cba1ca21cfaee7bb153915f850c102fbd5661e8f5ff6872c8400103346e71d258113405c5c0f752c5dffc1 WHIRLPOOL 9e44a26543de5375e45fdfb576511115f8e63f8e6a7865c7d1183660672e60b4f3f1f2027fe2677f71ca256997c89ad1281799256f102bf5aa56f57844f6f055 DIST system-config-printer-1.4.3.tar.xz 892132 SHA256 c14bb1b75929ccf31267da8cf774bed923c4ea3eb0deddcc255221c0b8844c0f SHA512 36584b7caa26765160beaf3cddc9b4e7bad05d93e3a7960911f2e6a129e7c811fabcd25cc728c2eb0c7aa14f0f1dd66425f2d767adc8ee6eaaa4a3a0b77d280f WHIRLPOOL cc955dd3c979b75bbb40a98c1ad13276f7775807c098ac97bf9c5cf37109f24073d2d886695e357f8a417ab34ce5aa8fea5cc7add4dddf4f67fb00c3fb529e45 diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch deleted file mode 100644 index f2240045f887..000000000000 --- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.12-split.patch +++ /dev/null @@ -1,177 +0,0 @@ -diff -ruN system-config-printer-1.3.12/Makefile.am my/Makefile.am ---- system-config-printer-1.3.12/Makefile.am 2012-10-04 15:51:04.000000000 +0200 -+++ my/Makefile.am 2012-11-19 00:45:25.702660438 +0100 -@@ -1,5 +1,3 @@ --CFLAGS=-g -O2 -Wall -- - SUBDIRS=po - - EXPORT_MODULES= \ -@@ -84,88 +82,21 @@ - rm -f .stamp-distutils-in-builddir - - nobase_pkgdata_SCRIPTS= \ -- check-device-ids.py \ -- pysmb.py \ -- scp-dbus-service.py \ -- system-config-printer.py \ -- troubleshoot/__init__.py \ -- applet.py -+ check-device-ids.py - - nobase_pkgdata_DATA= \ -- asyncconn.py \ -- asyncipp.py \ -- asyncpk1.py \ -- authconn.py \ - config.py \ -- cupspk.py \ - debug.py \ - dnssdresolve.py \ -- errordialogs.py \ -- HIG.py \ - firewall.py \ -- gui.py \ -- gtkinklevel.py \ -- gtkspinner.py \ - installpackage.py \ -- jobviewer.py \ - monitor.py \ -- newprinter.py \ -- options.py \ -- optionwidgets.py \ - PhysicalDevice.py \ -- ppdcache.py \ - ppdippstr.py \ -- ppdsloader.py \ -- printerproperties.py \ - probe_printer.py \ -- gtk_label_autowrap.py \ - SearchCriterion.py \ -- serversettings.py \ - smburi.py \ - statereason.py \ -- timedops.py \ -- ToolbarSearchEntry.py \ -- userdefault.py \ -- ui/AboutDialog.ui \ -- ui/ConnectDialog.ui \ -- ui/ConnectingDialog.ui \ -- ui/InstallDialog.ui \ -- ui/JobsWindow.ui \ -- ui/NewPrinterName.ui \ -- ui/NewPrinterWindow.ui \ -- ui/PrinterPropertiesDialog.ui \ -- ui/PrintersWindow.ui \ -- ui/ServerSettingsDialog.ui \ -- ui/SMBBrowseDialog.ui \ -- ui/statusicon_popupmenu.ui \ -- ui/WaitWindow.ui \ -- icons/i-network-printer.png \ -- troubleshoot/base.py \ -- troubleshoot/CheckLocalServerPublishing.py \ -- troubleshoot/CheckNetworkServerSanity.py \ -- troubleshoot/CheckPPDSanity.py \ -- troubleshoot/CheckPrinterSanity.py \ -- troubleshoot/CheckSELinux.py \ -- troubleshoot/CheckUSBPermissions.py \ -- troubleshoot/ChooseNetworkPrinter.py \ -- troubleshoot/ChoosePrinter.py \ -- troubleshoot/DeviceListed.py \ -- troubleshoot/ErrorLogCheckpoint.py \ -- troubleshoot/ErrorLogFetch.py \ -- troubleshoot/ErrorLogParse.py \ -- troubleshoot/Locale.py \ -- troubleshoot/LocalOrRemote.py \ -- troubleshoot/NetworkCUPSPrinterShared.py \ -- troubleshoot/PrinterStateReasons.py \ -- troubleshoot/PrintTestPage.py \ -- troubleshoot/QueueNotEnabled.py \ -- troubleshoot/QueueRejectingJobs.py \ -- troubleshoot/RemoteAddress.py \ -- troubleshoot/SchedulerNotRunning.py \ -- troubleshoot/ServerFirewalled.py \ -- troubleshoot/Shrug.py \ -- troubleshoot/VerifyPackages.py \ -- troubleshoot/Welcome.py \ - xml/preferreddrivers.rng \ - xml/validate.py - -@@ -173,18 +104,13 @@ - cupshelpers_DATA=\ - xml/preferreddrivers.xml - --bin_SCRIPTS= \ -- system-config-printer \ -- system-config-printer-applet \ -- dbus/scp-dbus-service -- - if UDEV_RULES - udevrulesdir=$(sysconfdir)/udev/rules.d - udevrules_DATA=udev/70-printers.rules - udev_udev_configure_printer_SOURCES=\ - udev/udev-configure-printer.c --udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS) --udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS) -+udev_udev_configure_printer_LDADD= -lcups $(libudev_LIBS) $(libusb_LIBS) $(GLIB_LIBS) -+udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libudev_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS) - udevhelperdir=$(sysconfdir)/udev - udevhelper_PROGRAMS=\ - udev/udev-configure-printer -@@ -202,56 +128,17 @@ - - endif - --man_MANS= \ -- man/system-config-printer.1 \ -- man/system-config-printer-applet.1 -- - dbus_DATA = \ - dbus/com.redhat.NewPrinterNotification.conf \ - dbus/com.redhat.PrinterDriversInstaller.conf - dbusdir = $(sysconfdir)/dbus-1/system.d/ - --dbusinterfaces_DATA = \ -- dbus/org.fedoraproject.Config.Printing.xml --dbusinterfacesdir = $(datadir)/dbus-1/interfaces/ -- --dbusservices_DATA = \ -- dbus/org.fedoraproject.Config.Printing.service --dbusservicesdir = $(datadir)/dbus-1/services/ -- --desktop_DATA =\ -- system-config-printer.desktop \ -- print-applet.desktop - desktopdir = $(datadir)/applications/ - autostartdir = $(sysconfdir)/xdg/autostart/ - - DESKTOP_VENDOR=@DESKTOPVENDOR@ - DESKTOP_PREFIX=@DESKTOPPREFIX@ - --install-desktopDATA: $(desktop_DATA) -- mkdir -p $(DESTDIR)$(desktopdir) -- mkdir -p $(DESTDIR)$(desktopdir) -- desktop-file-install $(DESKTOP_VENDOR) \ -- --dir $(DESTDIR)$(desktopdir) \ -- --add-category System \ -- --add-category Settings \ -- --add-category HardwareSettings \ -- --add-category Printing \ -- --add-category GTK \ -- system-config-printer.desktop -- desktop-file-install $(DESKTOP_VENDOR) \ -- --dir $(DESTDIR)$(autostartdir) \ -- --add-category System \ -- --add-category Monitor \ -- --add-category GTK \ -- print-applet.desktop -- --uninstall-desktopDATA: -- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop -- rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop -- --desktop_in_files = $(desktop_DATA:.desktop=.desktop.in) -- - EXTRA_DIST=\ - $(nobase_pkgdata_SCRIPTS) \ - $(nobase_pkgdata_DATA) \ diff --git a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.13-split.patch b/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.13-split.patch deleted file mode 100644 index 172289811f65..000000000000 --- a/app-admin/system-config-printer-common/files/system-config-printer-common-1.3.13-split.patch +++ /dev/null @@ -1,178 +0,0 @@ ---- system-config-printer-1.3.13/Makefile.am.org 2013-10-27 22:22:54.057495728 +0100 -+++ system-config-printer-1.3.13/Makefile.am 2013-10-27 22:29:26.054299236 +0100 -@@ -1,5 +1,3 @@ --CFLAGS=-g -O2 -Wall -- - SUBDIRS=po - - EXPORT_MODULES= \ -@@ -84,89 +82,21 @@ - rm -f .stamp-distutils-in-builddir - - nobase_pkgdata_SCRIPTS= \ -- check-device-ids.py \ -- pysmb.py \ -- scp-dbus-service.py \ -- system-config-printer.py \ -- install-printerdriver.py \ -- troubleshoot/__init__.py \ -- applet.py -+ check-device-ids.py - - nobase_pkgdata_DATA= \ -- asyncconn.py \ -- asyncipp.py \ -- asyncpk1.py \ -- authconn.py \ - config.py \ -- cupspk.py \ - debug.py \ - dnssdresolve.py \ -- errordialogs.py \ -- HIG.py \ - firewall.py \ -- gui.py \ -- gtkinklevel.py \ -- gtkspinner.py \ - installpackage.py \ -- jobviewer.py \ - monitor.py \ -- newprinter.py \ -- options.py \ -- optionwidgets.py \ - PhysicalDevice.py \ -- ppdcache.py \ - ppdippstr.py \ -- ppdsloader.py \ -- printerproperties.py \ - probe_printer.py \ -- gtk_label_autowrap.py \ - SearchCriterion.py \ -- serversettings.py \ - smburi.py \ - statereason.py \ -- timedops.py \ -- ToolbarSearchEntry.py \ -- userdefault.py \ -- ui/AboutDialog.ui \ -- ui/ConnectDialog.ui \ -- ui/ConnectingDialog.ui \ -- ui/InstallDialog.ui \ -- ui/JobsWindow.ui \ -- ui/NewPrinterName.ui \ -- ui/NewPrinterWindow.ui \ -- ui/PrinterPropertiesDialog.ui \ -- ui/PrintersWindow.ui \ -- ui/ServerSettingsDialog.ui \ -- ui/SMBBrowseDialog.ui \ -- ui/statusicon_popupmenu.ui \ -- ui/WaitWindow.ui \ -- icons/i-network-printer.png \ -- troubleshoot/base.py \ -- troubleshoot/CheckLocalServerPublishing.py \ -- troubleshoot/CheckNetworkServerSanity.py \ -- troubleshoot/CheckPPDSanity.py \ -- troubleshoot/CheckPrinterSanity.py \ -- troubleshoot/CheckSELinux.py \ -- troubleshoot/CheckUSBPermissions.py \ -- troubleshoot/ChooseNetworkPrinter.py \ -- troubleshoot/ChoosePrinter.py \ -- troubleshoot/DeviceListed.py \ -- troubleshoot/ErrorLogCheckpoint.py \ -- troubleshoot/ErrorLogFetch.py \ -- troubleshoot/ErrorLogParse.py \ -- troubleshoot/Locale.py \ -- troubleshoot/LocalOrRemote.py \ -- troubleshoot/NetworkCUPSPrinterShared.py \ -- troubleshoot/PrinterStateReasons.py \ -- troubleshoot/PrintTestPage.py \ -- troubleshoot/QueueNotEnabled.py \ -- troubleshoot/QueueRejectingJobs.py \ -- troubleshoot/RemoteAddress.py \ -- troubleshoot/SchedulerNotRunning.py \ -- troubleshoot/ServerFirewalled.py \ -- troubleshoot/Shrug.py \ -- troubleshoot/VerifyPackages.py \ -- troubleshoot/Welcome.py \ - xml/preferreddrivers.rng \ - xml/validate.py - -@@ -174,19 +104,13 @@ - cupshelpers_DATA=\ - xml/preferreddrivers.xml - --bin_SCRIPTS= \ -- system-config-printer \ -- install-printerdriver \ -- system-config-printer-applet \ -- dbus/scp-dbus-service -- - if UDEV_RULES - udevrulesdir=$(sysconfdir)/udev/rules.d - udevrules_DATA=udev/70-printers.rules - udev_udev_configure_printer_SOURCES=\ - udev/udev-configure-printer.c --udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS) --udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS) -+udev_udev_configure_printer_LDADD= -lcups $(libudev_LIBS) $(libusb_LIBS) $(GLIB_LIBS) -+udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libudev_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS) - udevhelperdir=$(sysconfdir)/udev - udevhelper_PROGRAMS=\ - udev/udev-configure-printer -@@ -204,56 +128,17 @@ - - endif - --man_MANS= \ -- man/system-config-printer.1 \ -- man/system-config-printer-applet.1 -- - dbus_DATA = \ - dbus/com.redhat.NewPrinterNotification.conf \ - dbus/com.redhat.PrinterDriversInstaller.conf - dbusdir = $(sysconfdir)/dbus-1/system.d/ - --dbusinterfaces_DATA = \ -- dbus/org.fedoraproject.Config.Printing.xml --dbusinterfacesdir = $(datadir)/dbus-1/interfaces/ -- --dbusservices_DATA = \ -- dbus/org.fedoraproject.Config.Printing.service --dbusservicesdir = $(datadir)/dbus-1/services/ -- --desktop_DATA =\ -- system-config-printer.desktop \ -- print-applet.desktop - desktopdir = $(datadir)/applications/ - autostartdir = $(sysconfdir)/xdg/autostart/ - - DESKTOP_VENDOR=@DESKTOPVENDOR@ - DESKTOP_PREFIX=@DESKTOPPREFIX@ - --install-desktopDATA: $(desktop_DATA) -- mkdir -p $(DESTDIR)$(desktopdir) -- mkdir -p $(DESTDIR)$(desktopdir) -- desktop-file-install $(DESKTOP_VENDOR) \ -- --dir $(DESTDIR)$(desktopdir) \ -- --add-category System \ -- --add-category Settings \ -- --add-category HardwareSettings \ -- --add-category Printing \ -- --add-category GTK \ -- system-config-printer.desktop -- desktop-file-install $(DESKTOP_VENDOR) \ -- --dir $(DESTDIR)$(autostartdir) \ -- --add-category System \ -- --add-category Monitor \ -- --add-category GTK \ -- print-applet.desktop -- --uninstall-desktopDATA: -- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop -- rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop -- --desktop_in_files = $(desktop_DATA:.desktop=.desktop.in) -- - EXTRA_DIST=\ - $(nobase_pkgdata_SCRIPTS) \ - $(nobase_pkgdata_DATA) \ diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild deleted file mode 100644 index f4befde72175..000000000000 --- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.12.ebuild,v 1.13 2014/07/30 19:17:42 ssuominen Exp $ - -EAPI=4 - -PYTHON_DEPEND="2:2.6" -WANT_AUTOMAKE="1.11" - -inherit autotools eutils python toolchain-funcs udev - -MY_P=${PN%-common}-${PV} - -DESCRIPTION="Common modules of Red Hat's printer administration tool" -HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/" -SRC_URI="http://cyberelk.net/tim/data/${PN/-common}/${PV%.*}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86" -SLOT="0" -IUSE="doc policykit" - -# Needs cups running, bug 284005 -RESTRICT="test" - -# system-config-printer split since 1.1.3 -COMMON_DEPEND=" - >=dev-libs/glib-2 - dev-libs/libxml2[python] - dev-python/dbus-python - >=dev-python/pycups-1.9.60 - dev-python/pycurl - >=dev-python/pygobject-2.21.5:2 - net-print/cups[dbus] - >=virtual/udev-172 - virtual/libusb:1 -" -DEPEND="${COMMON_DEPEND} - dev-util/intltool - virtual/pkgconfig - doc? ( dev-python/epydoc ) -" -RDEPEND="${COMMON_DEPEND} - !=sys-auth/polkit-0.104-r1 ) -" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.3.12-split.patch - eautoreconf -} - -src_configure() { - econf \ - --disable-nls \ - --with-udev-rules -} - -src_compile() { - emake - use doc && emake html -} - -src_install() { - emake \ - DESTDIR="${D}" \ - udevhelperdir="$(get_udevdir)" \ - udevrulesdir="$(get_udevdir)/rules.d" \ - install - - dodoc AUTHORS ChangeLog README - use doc && dohtml -r html/ - - python_convert_shebangs -q -r $(python_get_version) "${ED}" -} - -pkg_postinst() { - python_mod_optimize cupshelpers -} - -pkg_postrm() { - python_mod_cleanup cupshelpers /usr/share/system-config-printer -} diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.3.13.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.3.13.ebuild deleted file mode 100644 index d49ad887f9d5..000000000000 --- a/app-admin/system-config-printer-common/system-config-printer-common-1.3.13.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.13.ebuild,v 1.2 2014/07/30 19:17:42 ssuominen Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_{6,7} ) -PYTHON_REQ_USE="xml" - -inherit autotools eutils python-single-r1 udev systemd - -MY_P=${PN%-common}-${PV} - -DESCRIPTION="Common modules of Red Hat's printer administration tool" -HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/" -SRC_URI="http://cyberelk.net/tim/data/${PN/-common}/${PV%.*}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" -SLOT="0" -IUSE="doc policykit" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Needs cups running, bug 284005 -RESTRICT="test" - -# system-config-printer split since 1.1.3 -# -# Additional unhandled dependencies: -# net-firewall/firewalld[${PYTHON_USEDEP}] -# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ? -COMMON_DEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2 - dev-libs/libxml2[python,${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - >=dev-python/pycups-1.9.60[${PYTHON_USEDEP}] - dev-python/pycurl[${PYTHON_USEDEP}] - >=dev-python/pygobject-2.21.5:2[${PYTHON_USEDEP}] - net-print/cups[dbus] - virtual/libusb:1 - >=virtual/udev-172 -" -DEPEND="${COMMON_DEPEND} - dev-util/intltool - virtual/pkgconfig - doc? ( dev-python/epydoc[${PYTHON_USEDEP}] ) -" -RDEPEND="${COMMON_DEPEND} - !=sys-auth/polkit-0.104-r1 ) -" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.3.13-split.patch - eautoreconf -} - -src_configure() { - econf \ - --disable-nls \ - --with-udev-rules \ - $(systemd_with_unitdir) -} - -src_compile() { - emake - use doc && emake html -} - -src_install() { - emake \ - DESTDIR="${D}" \ - udevhelperdir="$(get_udevdir)" \ - udevrulesdir="$(get_udevdir)/rules.d" \ - install - - dodoc AUTHORS ChangeLog README - use doc && dohtml -r html/ - - python_fix_shebang "${ED}" -} diff --git a/app-admin/system-config-printer-gnome/Manifest b/app-admin/system-config-printer-gnome/Manifest index 9a85ed54e187..cd546ef48691 100644 --- a/app-admin/system-config-printer-gnome/Manifest +++ b/app-admin/system-config-printer-gnome/Manifest @@ -1,3 +1 @@ -DIST system-config-printer-1.3.12.tar.xz 949008 SHA256 1905bd9fd382730a8eab80fa196b1c43bd19ce79c2169142de899697cbb1e9b1 SHA512 4e6c15b52287f2a69fabb6dafe6548874b8608f2f7a2e14534b100fbb46ad0f146b1e03a6aa4c2c9fe66dad96789454bd066616db0dd73b962bffeb478a7c6c5 WHIRLPOOL 0b8afe05a87103ef99dac50ab7db5f3fc6137de9b84e483ee3a481172e4c894e206b6d022303f1f11496a63b5698351a67070fb936f35293e83f5a20c5e21599 -DIST system-config-printer-1.3.13.tar.xz 955636 SHA256 9a6a4fbf61b1aafa061674719321846665ee7a4e7ab96dd4747069b0927d12a6 SHA512 046501d17c33a2ff72020b3d20210c5544c6310469cba1ca21cfaee7bb153915f850c102fbd5661e8f5ff6872c8400103346e71d258113405c5c0f752c5dffc1 WHIRLPOOL 9e44a26543de5375e45fdfb576511115f8e63f8e6a7865c7d1183660672e60b4f3f1f2027fe2677f71ca256997c89ad1281799256f102bf5aa56f57844f6f055 DIST system-config-printer-1.4.3.tar.xz 892132 SHA256 c14bb1b75929ccf31267da8cf774bed923c4ea3eb0deddcc255221c0b8844c0f SHA512 36584b7caa26765160beaf3cddc9b4e7bad05d93e3a7960911f2e6a129e7c811fabcd25cc728c2eb0c7aa14f0f1dd66425f2d767adc8ee6eaaa4a3a0b77d280f WHIRLPOOL cc955dd3c979b75bbb40a98c1ad13276f7775807c098ac97bf9c5cf37109f24073d2d886695e357f8a417ab34ce5aa8fea5cc7add4dddf4f67fb00c3fb529e45 diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch deleted file mode 100644 index 864aecfb1c5b..000000000000 --- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.12-split.patch +++ /dev/null @@ -1,183 +0,0 @@ -diff -ruN system-config-printer-1.3.12/Makefile.am my/Makefile.am ---- system-config-printer-1.3.12/Makefile.am 2012-10-04 15:51:04.000000000 +0200 -+++ my/Makefile.am 2012-11-06 04:05:52.745405001 +0100 -@@ -1,90 +1,8 @@ --CFLAGS=-g -O2 -Wall -+CFLAGS=-Wall - - SUBDIRS=po - --EXPORT_MODULES= \ -- cupshelpers/__init__.py \ -- cupshelpers/cupshelpers.py \ -- cupshelpers/installdriver.py \ -- cupshelpers/ppds.py \ -- cupshelpers/openprinting.py \ -- cupshelpers/xmldriverprefs.py -- --EXPORT_MODULES_GEN= \ -- cupshelpers/config.py -- --### Automake hooks for Distutils. --# The distutils module doesn't understand srcdir != builddir, --# so we copy in, along with the cupshelpers modules, into --# the builddir for 'all', 'install-exec', and 'clean' hooks. --.stamp-distutils-in-builddir: setup.py $(EXPORT_MODULES) -- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \ -- cp $(top_srcdir)/setup.py .; \ -- $(mkdir_p) cupshelpers; \ -- for file in $(EXPORT_MODULES); do \ -- cp $(top_srcdir)/$$file $$file; \ -- done; \ -- fi -- touch .stamp-distutils-in-builddir -- --dist-hook: mk-ChangeLog --.PHONE: mk-ChangeLog --mk-ChangeLog: -- if test -d .git; then \ -- $(top_srcdir)/gitlog-to-changelog \ -- --since=2009-05-01 -- --no-merges \ -- > $(distdir)/cl ; \ -- mv -f $(distdir)/cl $(distdir)/ChangeLog ; \ -- fi -- --config.py: config.py.in Makefile -- sed \ -- -e "s|\@prefix\@|$(prefix)|" \ -- -e "s|\@datadir\@|$(datadir)|" \ -- -e "s|\@localedir\@|$(localedir)|" \ -- -e "s|\@VERSION\@|$(VERSION)|" \ -- -e "s|\@PACKAGE\@|$(PACKAGE)|" \ -- $< > $@ -- --cupshelpers/config.py: cupshelpers/config.py.in Makefile -- $(mkdir_p) cupshelpers -- sed \ -- -e "s|\@prefix\@|$(prefix)|" \ -- -e "s|\@sysconfdir\@|$(sysconfdir)|" \ -- -e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \ -- $< > $@ -- --# Use distutils to build the module. --all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py -- $(PYTHON) setup.py build -- --# Use distutils to install the module. --install-exec-local: .stamp-distutils-in-builddir -- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) -- --# Uninstall the module, crossing our fingers that we know enough --# about how distutils works to do this. Unfortunately, distutils --# doesn't provide a way to do this itself. --uninstall-local: -- rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info -- for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do \ -- rm -f $(DESTDIR)/$(pythondir)/$$file*; \ -- done -- --# Tell distutils to clean up. --clean-local: -- -$(PYTHON) setup.py clean --all -- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \ -- rm -f setup.py; \ -- for file in $(EXPORT_MODULES) \ -- $(EXPORT_MODULES_GEN); do \ -- rm -f $$file*; \ -- done; \ -- fi -- rm -f .stamp-distutils-in-builddir -- - nobase_pkgdata_SCRIPTS= \ -- check-device-ids.py \ - pysmb.py \ - scp-dbus-service.py \ - system-config-printer.py \ -@@ -96,33 +14,21 @@ - asyncipp.py \ - asyncpk1.py \ - authconn.py \ -- config.py \ - cupspk.py \ -- debug.py \ -- dnssdresolve.py \ - errordialogs.py \ - HIG.py \ -- firewall.py \ - gui.py \ - gtkinklevel.py \ - gtkspinner.py \ -- installpackage.py \ - jobviewer.py \ -- monitor.py \ - newprinter.py \ - options.py \ - optionwidgets.py \ -- PhysicalDevice.py \ - ppdcache.py \ -- ppdippstr.py \ - ppdsloader.py \ - printerproperties.py \ -- probe_printer.py \ - gtk_label_autowrap.py \ -- SearchCriterion.py \ - serversettings.py \ -- smburi.py \ -- statereason.py \ - timedops.py \ - ToolbarSearchEntry.py \ - userdefault.py \ -@@ -165,52 +71,17 @@ - troubleshoot/ServerFirewalled.py \ - troubleshoot/Shrug.py \ - troubleshoot/VerifyPackages.py \ -- troubleshoot/Welcome.py \ -- xml/preferreddrivers.rng \ -- xml/validate.py -- --cupshelpersdir=$(sysconfdir)/cupshelpers --cupshelpers_DATA=\ -- xml/preferreddrivers.xml -+ troubleshoot/Welcome.py - - bin_SCRIPTS= \ - system-config-printer \ - system-config-printer-applet \ - dbus/scp-dbus-service - --if UDEV_RULES --udevrulesdir=$(sysconfdir)/udev/rules.d --udevrules_DATA=udev/70-printers.rules --udev_udev_configure_printer_SOURCES=\ -- udev/udev-configure-printer.c --udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS) --udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS) --udevhelperdir=$(sysconfdir)/udev --udevhelper_PROGRAMS=\ -- udev/udev-configure-printer --udevhelper_SCRIPTS=\ -- udev/udev-add-printer -- --if HAVE_SYSTEMD --%.service: %.service.in -- $(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@ --systemdsystemunit_DATA = \ -- udev/configure-printer@.service --CLEANFILES = \ -- $(systemdsystemunit_DATA) --endif -- --endif -- - man_MANS= \ - man/system-config-printer.1 \ - man/system-config-printer-applet.1 - --dbus_DATA = \ -- dbus/com.redhat.NewPrinterNotification.conf \ -- dbus/com.redhat.PrinterDriversInstaller.conf --dbusdir = $(sysconfdir)/dbus-1/system.d/ -- - dbusinterfaces_DATA = \ - dbus/org.fedoraproject.Config.Printing.xml - dbusinterfacesdir = $(datadir)/dbus-1/interfaces/ diff --git a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch b/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch deleted file mode 100644 index c3b79631ac2b..000000000000 --- a/app-admin/system-config-printer-gnome/files/system-config-printer-gnome-1.3.13-split.patch +++ /dev/null @@ -1,182 +0,0 @@ ---- system-config-printer-1.3.13/Makefile.am.org 2013-10-27 22:22:54.057495728 +0100 -+++ system-config-printer-1.3.13/Makefile.am 2013-10-27 22:36:30.230851350 +0100 -@@ -1,90 +1,6 @@ --CFLAGS=-g -O2 -Wall -- - SUBDIRS=po - --EXPORT_MODULES= \ -- cupshelpers/__init__.py \ -- cupshelpers/cupshelpers.py \ -- cupshelpers/installdriver.py \ -- cupshelpers/ppds.py \ -- cupshelpers/openprinting.py \ -- cupshelpers/xmldriverprefs.py -- --EXPORT_MODULES_GEN= \ -- cupshelpers/config.py -- --### Automake hooks for Distutils. --# The distutils module doesn't understand srcdir != builddir, --# so we copy in, along with the cupshelpers modules, into --# the builddir for 'all', 'install-exec', and 'clean' hooks. --.stamp-distutils-in-builddir: setup.py $(EXPORT_MODULES) -- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \ -- cp $(top_srcdir)/setup.py .; \ -- $(mkdir_p) cupshelpers; \ -- for file in $(EXPORT_MODULES); do \ -- cp $(top_srcdir)/$$file $$file; \ -- done; \ -- fi -- touch .stamp-distutils-in-builddir -- --dist-hook: mk-ChangeLog --.PHONE: mk-ChangeLog --mk-ChangeLog: -- if test -d .git; then \ -- $(top_srcdir)/gitlog-to-changelog \ -- --since=2009-05-01 -- --no-merges \ -- > $(distdir)/cl ; \ -- mv -f $(distdir)/cl $(distdir)/ChangeLog ; \ -- fi -- --config.py: config.py.in Makefile -- sed \ -- -e "s|\@prefix\@|$(prefix)|" \ -- -e "s|\@datadir\@|$(datadir)|" \ -- -e "s|\@localedir\@|$(localedir)|" \ -- -e "s|\@VERSION\@|$(VERSION)|" \ -- -e "s|\@PACKAGE\@|$(PACKAGE)|" \ -- $< > $@ -- --cupshelpers/config.py: cupshelpers/config.py.in Makefile -- $(mkdir_p) cupshelpers -- sed \ -- -e "s|\@prefix\@|$(prefix)|" \ -- -e "s|\@sysconfdir\@|$(sysconfdir)|" \ -- -e "s|\@cupsserverbindir\@|$(cupsserverbindir)|" \ -- $< > $@ -- --# Use distutils to build the module. --all-local: .stamp-distutils-in-builddir config.py cupshelpers/config.py -- $(PYTHON) setup.py build -- --# Use distutils to install the module. --install-exec-local: .stamp-distutils-in-builddir -- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) -- --# Uninstall the module, crossing our fingers that we know enough --# about how distutils works to do this. Unfortunately, distutils --# doesn't provide a way to do this itself. --uninstall-local: -- rm -f $(DESTDIR)/$(pythondir)/cupshelpers*.egg-info -- for file in $(EXPORT_MODULES) $(EXPORT_MODULES_GEN); do \ -- rm -f $(DESTDIR)/$(pythondir)/$$file*; \ -- done -- --# Tell distutils to clean up. --clean-local: -- -$(PYTHON) setup.py clean --all -- if [ "$(top_srcdir)" != "$(top_builddir)" ]; then \ -- rm -f setup.py; \ -- for file in $(EXPORT_MODULES) \ -- $(EXPORT_MODULES_GEN); do \ -- rm -f $$file*; \ -- done; \ -- fi -- rm -f .stamp-distutils-in-builddir -- - nobase_pkgdata_SCRIPTS= \ -- check-device-ids.py \ - pysmb.py \ - scp-dbus-service.py \ - system-config-printer.py \ -@@ -97,33 +13,21 @@ - asyncipp.py \ - asyncpk1.py \ - authconn.py \ -- config.py \ - cupspk.py \ -- debug.py \ -- dnssdresolve.py \ - errordialogs.py \ - HIG.py \ -- firewall.py \ - gui.py \ - gtkinklevel.py \ - gtkspinner.py \ -- installpackage.py \ - jobviewer.py \ -- monitor.py \ - newprinter.py \ - options.py \ - optionwidgets.py \ -- PhysicalDevice.py \ - ppdcache.py \ -- ppdippstr.py \ - ppdsloader.py \ - printerproperties.py \ -- probe_printer.py \ - gtk_label_autowrap.py \ -- SearchCriterion.py \ - serversettings.py \ -- smburi.py \ -- statereason.py \ - timedops.py \ - ToolbarSearchEntry.py \ - userdefault.py \ -@@ -166,13 +70,7 @@ - troubleshoot/ServerFirewalled.py \ - troubleshoot/Shrug.py \ - troubleshoot/VerifyPackages.py \ -- troubleshoot/Welcome.py \ -- xml/preferreddrivers.rng \ -- xml/validate.py -- --cupshelpersdir=$(sysconfdir)/cupshelpers --cupshelpers_DATA=\ -- xml/preferreddrivers.xml -+ troubleshoot/Welcome.py - - bin_SCRIPTS= \ - system-config-printer \ -@@ -180,39 +78,10 @@ - system-config-printer-applet \ - dbus/scp-dbus-service - --if UDEV_RULES --udevrulesdir=$(sysconfdir)/udev/rules.d --udevrules_DATA=udev/70-printers.rules --udev_udev_configure_printer_SOURCES=\ -- udev/udev-configure-printer.c --udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS) --udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS) --udevhelperdir=$(sysconfdir)/udev --udevhelper_PROGRAMS=\ -- udev/udev-configure-printer --udevhelper_SCRIPTS=\ -- udev/udev-add-printer -- --if HAVE_SYSTEMD --%.service: %.service.in -- $(AM_V_GEN)sed -e 's,@udevhelperdir\@,$(udevhelperdir),g' $< > $@ --systemdsystemunit_DATA = \ -- udev/configure-printer@.service --CLEANFILES = \ -- $(systemdsystemunit_DATA) --endif -- --endif -- - man_MANS= \ - man/system-config-printer.1 \ - man/system-config-printer-applet.1 - --dbus_DATA = \ -- dbus/com.redhat.NewPrinterNotification.conf \ -- dbus/com.redhat.PrinterDriversInstaller.conf --dbusdir = $(sysconfdir)/dbus-1/system.d/ -- - dbusinterfaces_DATA = \ - dbus/org.fedoraproject.Config.Printing.xml - dbusinterfacesdir = $(datadir)/dbus-1/interfaces/ diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild deleted file mode 100644 index 2d891c40c431..000000000000 --- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.12.ebuild,v 1.12 2013/05/28 19:13:30 reavertm Exp $ - -EAPI="3" - -PYTHON_DEPEND="2" -PYTHON_USE_WITH="xml" -WANT_AUTOMAKE="1.11" -inherit eutils python autotools - -MY_P="${PN%-gnome}-${PV}" - -DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool" -HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/" -SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86" -SLOT="0" -IUSE="gnome-keyring" - -# Needs cups running, bug 284005 -RESTRICT="test" - -RDEPEND=" - ~app-admin/system-config-printer-common-${PV} - dev-python/notify-python - >=dev-python/pycups-1.9.60 - >=dev-python/pygtk-2.4 - gnome-keyring? ( dev-python/gnome-keyring-python ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=app-text/xmlto-0.0.22 - dev-util/desktop-file-utils - dev-util/intltool - virtual/pkgconfig - sys-devel/gettext -" - -APP_LINGUAS="ar as bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr gu -he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl -pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW" -for X in ${APP_LINGUAS}; do - IUSE="${IUSE} linguas_${X}" -done - -S="${WORKDIR}/${MY_P}" - -# Bug 471472 -MAKEOPTS+=" -j1" - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.3.12-split.patch" - eautoreconf -} - -src_configure() { - local myconf - - # Disable installation of translations when LINGUAS not chosen - if [[ -z "${LINGUAS}" ]]; then - myconf="${myconf} --disable-nls" - else - myconf="${myconf} --enable-nls" - fi - - econf \ - --with-desktop-vendor=Gentoo \ - --without-udev-rules \ - ${myconf} -} - -src_install() { - dodoc AUTHORS ChangeLog README || die "dodoc failed" - - emake DESTDIR="${ED}" install || die "emake install failed" - - python_convert_shebangs -q -r $(python_get_version) "${ED}" -} - -pkg_postrm() { - python_mod_cleanup /usr/share/system-config-printer -} diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.13.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.13.ebuild deleted file mode 100644 index bf519543932c..000000000000 --- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.13.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.13.ebuild,v 1.1 2013/10/30 18:05:19 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -PYTHON_COMPAT=( python2_{6,7} ) -PYTHON_REQ_USE="xml" - -inherit autotools gnome2 eutils python-single-r1 versionator - -MY_P="${PN%-gnome}-${PV}" -MY_V="$(get_version_component_range 1-2)" - -DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool" -HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/" -SRC_URI="http://cyberelk.net/tim/data/system-config-printer/${MY_V}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" -SLOT="0" -IUSE="gnome-keyring" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Needs cups running, bug 284005 -RESTRICT="test" - -# Additional unhandled dependencies -# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ? -# python samba client: smbc -# selinux: needed for troubleshooting -RDEPEND=" - ${PYTHON_DEPS} - ~app-admin/system-config-printer-common-${PV} - dev-python/notify-python - >=dev-python/pycups-1.9.60[${PYTHON_USEDEP}] - >=dev-python/pygtk-2.4 - gnome-keyring? ( gnome-base/libgnome-keyring ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=app-text/xmlto-0.0.22 - dev-util/desktop-file-utils - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig -" - -APP_LINGUAS="ar as bg bn_IN bn br bs ca cs cy da de el en_GB es et fa fi fr gu -he hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl -pt_BR pt ro ru si sk sl sr@latin sr sv ta te th tr uk vi zh_CN zh_TW" -for X in ${APP_LINGUAS}; do - IUSE="${IUSE} linguas_${X}" -done - -S="${WORKDIR}/${MY_P}" - -# Bug 471472 -MAKEOPTS+=" -j1" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.3.13-split.patch - eautoreconf - gnome2_src_prepare -} - -src_configure() { - local myconf - - # Disable installation of translations when LINGUAS not chosen - if [[ -z "${LINGUAS}" ]]; then - myconf="${myconf} --disable-nls" - else - myconf="${myconf} --enable-nls" - fi - - gnome2_src_configure \ - --with-desktop-vendor=Gentoo \ - --without-udev-rules \ - ${myconf} -} - -src_install() { - gnome2_src_install - python_fix_shebang "${ED}" -} diff --git a/app-dicts/verbiste/verbiste-0.1.38.ebuild b/app-dicts/verbiste/verbiste-0.1.38.ebuild deleted file mode 100644 index 22aa5d12d2c8..000000000000 --- a/app-dicts/verbiste/verbiste-0.1.38.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-dicts/verbiste/verbiste-0.1.38.ebuild,v 1.4 2014/02/22 08:04:10 ago Exp $ - -EAPI="5" - -inherit eutils gnome2-utils fdo-mime - -DESCRIPTION="French conjugation system" -HOMEPAGE="http://sarrazip.com/dev/verbiste.html" -SRC_URI="http://sarrazip.com/dev/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" - -IUSE="gnome gtk" - -RDEPEND=" - >=dev-libs/libxml2-2.4.0:2 - gtk? ( >=x11-libs/gtk+-2.6:2 ) - gnome? ( - gnome-base/gnome-panel[bonobo] - >=gnome-base/libgnomeui-2.0 ) -" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - econf \ - --with-console-app \ - $(use_with gtk gtk-app) \ - $(use_with gnome gnome-app) \ - $(use_with gnome gnome-applet) -} - -src_install() { - default - prune_libtool_files - dodoc HACKING LISEZMOI - # file is only installed with USE=gnome - if use gtk && ! use gnome ; then - sed -e 's/Exec=.*/Exec=verbiste-gtk/' \ - -i src/gnome/verbiste.desktop || die - insinto usr/share/applications - doins src/gnome/verbiste.desktop - fi -} - -pkg_preinst() { - if use gtk || use gnome ; then - gnome2_icon_savelist - fi -} - -pkg_postinst() { - if use gtk || use gnome ; then - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update - fi -} - -pkg_postrm() { - if use gtk || use gnome ; then - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - gnome2_icon_cache_update - fi -} diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild deleted file mode 100644 index 6b8bee596b55..000000000000 --- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild +++ /dev/null @@ -1,367 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild,v 1.6 2014/11/10 18:09:48 ulm Exp $ - -EAPI=5 - -inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo - -if [[ ${PV##*.} = 9999 ]]; then - EBZR_PROJECT="emacs" - EBZR_BRANCH="emacs-24" - EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/" - # "Nosmart" is much faster for initial branching. - EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}" - EBZR_UNPACK_DIR="${WORKDIR}/emacs" - EBZR_WORKDIR_CHECKOUT="t" #434746 - inherit bzr - S="${EBZR_UNPACK_DIR}" -else - SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz - mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - # FULL_VERSION keeps the full version number, which is needed in - # order to determine some path information correctly for copy/move - # operations later on - FULL_VERSION="${PV%%_*}" - #S="${WORKDIR}/emacs-${FULL_VERSION}" - S="${WORKDIR}/emacs" -fi - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="http://www.gnu.org/software/emacs/" - -LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -SLOT="24" -IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" -REQUIRED_USE="?? ( aqua X )" - -RDEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] - net-libs/liblockfile - acl? ( virtual/acl ) - alsa? ( media-libs/alsa-lib ) - dbus? ( sys-apps/dbus ) - gfile? ( >=dev-libs/glib-2.28.6 ) - gnutls? ( net-libs/gnutls ) - gpm? ( sys-libs/gpm ) - hesiod? ( net-dns/hesiod ) - kerberos? ( virtual/krb5 ) - libxml2? ( >=dev-libs/libxml2-2.2.0 ) - selinux? ( sys-libs/libselinux ) - zlib? ( sys-libs/zlib ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gsettings? ( >=dev-libs/glib-2.28.6 ) - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg:0= ) - png? ( >=media-libs/libpng-1.4:0= ) - svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff ) - xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) - xft? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - m17n-lib? ( - >=dev-libs/libotf-0.9.4 - >=dev-libs/m17n-lib-1.5.1 - ) - ) - gtk? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - ) - !gtk? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( athena? ( x11-libs/libXaw ) ) - ) - ) - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - gzip-el? ( app-arch/gzip ) - pax_kernel? ( - sys-apps/attr - sys-apps/paxctl - )" - -if [[ ${PV##*.} = 9999 ]]; then - DEPEND="${DEPEND} - sys-apps/texinfo" -fi - -EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" -SITEFILE="20${PN}-${SLOT}-gentoo.el" - -src_prepare() { - if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \ - configure.ac) - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" - einfo "Emacs branch: ${EBZR_BRANCH}" - einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}" - einfo "Emacs version number: ${FULL_VERSION}" - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ - || die "Upstream version number changed to ${FULL_VERSION}" - fi - - epatch_user - - # Fix filename reference in redirected man page - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ - || die "unable to sed ctags.1" - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - strip-flags - filter-flags -pie #526948 - - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi - - local myconf - - if use alsa; then - use sound || ewarn \ - "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" - else - myconf+=" --with-sound=$(usex sound oss)" - fi - - if use X; then - myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" - - if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" - else - myconf+=" --without-xft" - myconf+=" --without-libotf --without-m17n-flt" - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." - fi - - local f - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" - for f in motif Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"gtk\" is set." - done - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" - for f in Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"motif\" is set." - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - else - einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" - fi - elif use aqua; then - einfo "Configuring to build with Nextstep (Cocoa) support" - myconf+=" --with-ns --disable-ns-self-contained" - myconf+=" --without-x" - else - myconf+=" --without-x --without-ns" - fi - - # Save version information in the Emacs binary. It will be available - # in variable "system-configuration-options". - myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" - if [[ ${PV##*.} = 9999 ]]; then - myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}" - fi - - econf \ - --program-suffix="-${EMACS_SUFFIX}" \ - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ - --localstatedir="${EPREFIX}"/var \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-gameuser="${GAMES_USER_DED:-games}" \ - --without-compress-install \ - --with-file-notification=$(usev gfile || usev inotify || echo no) \ - $(use_enable acl) \ - $(use_with dbus) \ - $(use_with gnutls) \ - $(use_with gpm) \ - $(use_with hesiod) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with libxml2 xml2) \ - $(use_with selinux) \ - $(use_with wide-int) \ - $(use_with zlib) \ - ${myconf} -} - -src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - emake -} - -src_install () { - emake DESTDIR="${D}" NO_BIN_LINK=t install - - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ - || die "moving emacs man page failed" - - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig - - # avoid collision between slots, see bug #169033 e.g. - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el - rm -rf "${ED}"/usr/share/{applications,icons} - rm -rf "${ED}"/var - - # remove unused /site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - # remove COPYING file (except for etc/COPYING used by describe-copying) - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING - - if use gzip-el; then - # compress .el files when a corresponding .elc exists - find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n - assert "gzip .el failed" - fi - - local cdir - if use source; then - cdir="/usr/share/emacs/${FULL_VERSION}/src" - insinto "${cdir}" - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.{c,h,m} - elif has installsources ${FEATURES}; then - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" - fi - - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF - X - ;;; ${PN}-${SLOT} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - Y (setq find-function-C-source-directory - Y "${EPREFIX}${cdir}") - X (let ((path (getenv "INFOPATH")) - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) - X (and path - X ;; move Emacs Info dir before anything else in /usr/share/info - X (let* ((p (cons nil (split-string path ":" t))) (q p)) - X (while (and (cdr q) (not (string-match re (cadr q)))) - X (setq q (cdr q))) - X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) - EOF - elisp-site-file-install "${T}/${SITEFILE}" || die - - dodoc README BUGS - - if use aqua; then - dodir /Applications/Gentoo - rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app - mv nextstep/Emacs.app \ - "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die - fi - - DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs - through the Emacs eselect module, which also redirects man and info - pages. Therefore, several Emacs versions can be installed at the - same time. \"man emacs.eselect\" for details. - \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is - strongly recommended that you use app-admin/emacs-updater to rebuild - all byte-compiled elisp files of the installed Emacs packages." - use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. - Installing media-fonts/font-adobe-{75,100}dpi on the X server's - machine would satisfy basic Emacs requirements under X11. - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs - for how to enable anti-aliased fonts." - use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." - readme.gentoo_create_doc -} - -pkg_preinst() { - # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi -} - -pkg_postinst() { - elisp-site-regen - - local pvr - for pvr in ${REPLACING_VERSIONS}; do - [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1 - done - readme.gentoo_print_elog - - if use livecd; then - # force an update of the emacs symlink for the livecd/dvd, - # because some microemacs packages set it with USE=livecd - eselect emacs update - elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then - # refresh symlinks in case any installed files have changed - eselect emacs set ${EMACS_SUFFIX} - else - eselect emacs update ifunset - fi -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild index 9b2b52a828e2..3eaf758670db 100644 --- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild,v 1.2 2014/11/10 18:09:48 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141031.ebuild,v 1.3 2014/11/13 12:55:24 ulm Exp $ EAPI=5 @@ -248,7 +248,7 @@ src_install () { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el - rm -rf "${ED}"/usr/share/{applications,icons} + rm -rf "${ED}"/usr/share/{appdata,applications,icons} rm -rf "${ED}"/var # remove unused /site-lisp dir diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild index d26399d0fd3d..9b6767ecd7e6 100644 --- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild,v 1.1 2014/11/11 18:31:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20141110.ebuild,v 1.2 2014/11/13 12:55:24 ulm Exp $ EAPI=5 @@ -248,7 +248,7 @@ src_install () { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el - rm -rf "${ED}"/usr/share/{applications,icons} + rm -rf "${ED}"/usr/share/{appdata,applications,icons} rm -rf "${ED}"/var # remove unused /site-lisp dir diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild index c170e57434d5..0e153c278133 100644 --- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.1 2014/11/12 08:45:37 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.2 2014/11/13 12:55:24 ulm Exp $ EAPI=5 @@ -244,7 +244,7 @@ src_install () { # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el - rm -rf "${ED}"/usr/share/{applications,icons} + rm -rf "${ED}"/usr/share/{appdata,applications,icons} rm -rf "${ED}"/var # remove unused /site-lisp dir diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild deleted file mode 100644 index 04d5860eb43b..000000000000 --- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild +++ /dev/null @@ -1,367 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild,v 1.4 2014/11/10 18:09:48 ulm Exp $ - -EAPI=5 - -inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo - -if [[ ${PV##*.} = 9999 ]]; then - EBZR_PROJECT="emacs" - EBZR_BRANCH="trunk" - EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/" - # "Nosmart" is much faster for initial branching. - EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}" - EBZR_UNPACK_DIR="${WORKDIR}/emacs" - EBZR_WORKDIR_CHECKOUT="t" #434746 - inherit bzr - S="${EBZR_UNPACK_DIR}" -else - SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz - mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - # FULL_VERSION keeps the full version number, which is needed in - # order to determine some path information correctly for copy/move - # operations later on - FULL_VERSION="${PV%%_*}" - #S="${WORKDIR}/emacs-${FULL_VERSION}" - S="${WORKDIR}/emacs" -fi - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="http://www.gnu.org/software/emacs/" - -LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -SLOT="25" -IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" -REQUIRED_USE="?? ( aqua X )" - -RDEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] - net-libs/liblockfile - acl? ( virtual/acl ) - alsa? ( media-libs/alsa-lib ) - dbus? ( sys-apps/dbus ) - gfile? ( >=dev-libs/glib-2.28.6 ) - gnutls? ( net-libs/gnutls ) - gpm? ( sys-libs/gpm ) - hesiod? ( net-dns/hesiod ) - kerberos? ( virtual/krb5 ) - libxml2? ( >=dev-libs/libxml2-2.2.0 ) - selinux? ( sys-libs/libselinux ) - zlib? ( sys-libs/zlib ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gsettings? ( >=dev-libs/glib-2.28.6 ) - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg:0= ) - png? ( >=media-libs/libpng-1.4:0= ) - svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff ) - xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) - xft? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - m17n-lib? ( - >=dev-libs/libotf-0.9.4 - >=dev-libs/m17n-lib-1.5.1 - ) - ) - gtk? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - ) - !gtk? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( athena? ( x11-libs/libXaw ) ) - ) - ) - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - gzip-el? ( app-arch/gzip ) - pax_kernel? ( - sys-apps/attr - sys-apps/paxctl - )" - -if [[ ${PV##*.} = 9999 ]]; then - DEPEND="${DEPEND} - sys-apps/texinfo" -fi - -EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" -SITEFILE="20${PN}-${SLOT}-gentoo.el" - -src_prepare() { - if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ - configure.ac) - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" - einfo "Emacs branch: ${EBZR_BRANCH}" - einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}" - einfo "Emacs version number: ${FULL_VERSION}" - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ - || die "Upstream version number changed to ${FULL_VERSION}" - fi - - epatch_user - - # Fix filename reference in redirected man page - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ - || die "unable to sed ctags.1" - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - strip-flags - filter-flags -pie #526948 - - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi - - local myconf - - if use alsa; then - use sound || ewarn \ - "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" - else - myconf+=" --with-sound=$(usex sound oss)" - fi - - if use X; then - myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" - - if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" - else - myconf+=" --without-xft" - myconf+=" --without-libotf --without-m17n-flt" - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." - fi - - local f - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" - for f in motif Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"gtk\" is set." - done - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" - for f in Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"motif\" is set." - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - else - einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" - fi - elif use aqua; then - einfo "Configuring to build with Nextstep (Cocoa) support" - myconf+=" --with-ns --disable-ns-self-contained" - myconf+=" --without-x" - else - myconf+=" --without-x --without-ns" - fi - - # Save version information in the Emacs binary. It will be available - # in variable "system-configuration-options". - myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" - if [[ ${PV##*.} = 9999 ]]; then - myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}" - fi - - econf \ - --program-suffix="-${EMACS_SUFFIX}" \ - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ - --localstatedir="${EPREFIX}"/var \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-gameuser="${GAMES_USER_DED:-games}" \ - --without-compress-install \ - --with-file-notification=$(usev gfile || usev inotify || echo no) \ - $(use_enable acl) \ - $(use_with dbus) \ - $(use_with gnutls) \ - $(use_with gpm) \ - $(use_with hesiod) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with libxml2 xml2) \ - $(use_with selinux) \ - $(use_with wide-int) \ - $(use_with zlib) \ - ${myconf} -} - -src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - emake -} - -src_install () { - emake DESTDIR="${D}" NO_BIN_LINK=t install - - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ - || die "moving emacs man page failed" - - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig - - # avoid collision between slots, see bug #169033 e.g. - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el - rm -rf "${ED}"/usr/share/{applications,icons} - rm -rf "${ED}"/var - - # remove unused /site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - # remove COPYING file (except for etc/COPYING used by describe-copying) - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING - - if use gzip-el; then - # compress .el files when a corresponding .elc exists - find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n - assert "gzip .el failed" - fi - - local cdir - if use source; then - cdir="/usr/share/emacs/${FULL_VERSION}/src" - insinto "${cdir}" - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.{c,h,m} - elif has installsources ${FEATURES}; then - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" - fi - - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF - X - ;;; ${PN}-${SLOT} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - Y (setq find-function-C-source-directory - Y "${EPREFIX}${cdir}") - X (let ((path (getenv "INFOPATH")) - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) - X (and path - X ;; move Emacs Info dir before anything else in /usr/share/info - X (let* ((p (cons nil (split-string path ":" t))) (q p)) - X (while (and (cdr q) (not (string-match re (cadr q)))) - X (setq q (cdr q))) - X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) - EOF - elisp-site-file-install "${T}/${SITEFILE}" || die - - dodoc README BUGS - - if use aqua; then - dodir /Applications/Gentoo - rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app - mv nextstep/Emacs.app \ - "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die - fi - - DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs - through the Emacs eselect module, which also redirects man and info - pages. Therefore, several Emacs versions can be installed at the - same time. \"man emacs.eselect\" for details. - \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is - strongly recommended that you use app-admin/emacs-updater to rebuild - all byte-compiled elisp files of the installed Emacs packages." - use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. - Installing media-fonts/font-adobe-{75,100}dpi on the X server's - machine would satisfy basic Emacs requirements under X11. - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs - for how to enable anti-aliased fonts." - use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." - readme.gentoo_create_doc -} - -pkg_preinst() { - # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi -} - -pkg_postinst() { - elisp-site-regen - - local pvr - for pvr in ${REPLACING_VERSIONS}; do - [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1 - done - readme.gentoo_print_elog - - if use livecd; then - # force an update of the emacs symlink for the livecd/dvd, - # because some microemacs packages set it with USE=livecd - eselect emacs update - elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then - # refresh symlinks in case any installed files have changed - eselect emacs set ${EMACS_SUFFIX} - else - eselect emacs update ifunset - fi -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-i18n/im-ja/im-ja-1.5-r2.ebuild b/app-i18n/im-ja/im-ja-1.5-r2.ebuild deleted file mode 100644 index 599b26450095..000000000000 --- a/app-i18n/im-ja/im-ja-1.5-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.5-r2.ebuild,v 1.10 2013/10/09 02:04:16 naota Exp $ - -EAPI="3" -inherit autotools gnome2 gnome2-utils eutils multilib - -DESCRIPTION="A Japanese input module for GTK2 and XIM" -HOMEPAGE="http://im-ja.sourceforge.net/" -SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz - http://im-ja.sourceforge.net/old/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="gnome canna freewnn skk anthy" -# --enable-debug causes build failure with gtk+-2.4 -#IUSE="${IUSE} debug" - -RDEPEND=">=dev-libs/glib-2.4:2 - >=dev-libs/atk-1.6 - >=x11-libs/gtk+-2.4:2 - >=x11-libs/pango-1.2.1 - >=gnome-base/gconf-2.4:2 - >=gnome-base/libglade-2.4:2.0 - >=gnome-base/libgnomeui-2.4 - gnome? ( - || ( - gnome-base/gnome-panel[bonobo] - "${T}/${PN}.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/${PN}.conf" || die -} - -pkg_postinst() { - gnome2_query_immodules_gtk2 - gnome2_pkg_postinst - elog - elog "This version of im-ja comes with experimental XIM support." - elog "If you'd like to try it out, run im-ja-xim-server and set" - elog "environment variable XMODIFIERS to @im=im-ja-xim-server" - elog "e.g.)" - elog "\t$ export XMODIFIERS=@im=im-ja-xim-server (sh)" - elog "\t> setenv XMODIFIERS @im=im-ja-xim-server (csh)" - elog -} - -pkg_postrm() { - gnome2_query_immodules_gtk2 - gnome2_pkg_postrm -} diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest index 9cfda3a625a3..fa864158810b 100644 --- a/app-i18n/uim/Manifest +++ b/app-i18n/uim/Manifest @@ -1,6 +1 @@ -DIST uim-1.7.3.tar.bz2 6380469 SHA256 d2909d2d624a92677935461ce03413f33b7e5af6e19796410406628e59bd561c SHA512 4879595417c77c3c14e579b2fa6e393f87a056910f9eb126262eedfc39c8b45192e8647c45dfbcd57e0a8bc074694b9988c5d5bafdd99942d9d89e90a66fc14c WHIRLPOOL 27e0865ad63d5daa0047927b7dee89097e39efc6dc4d82915768b5cb3deabc93464cc7f9836d22a620d530834dc03af2fe0bd5ae4e1390e8164520579f26d6aa -DIST uim-1.8.0.tar.bz2 6453678 SHA256 bf760f51b37e4d3a2c960357faea2ef52d1bb7ee06252284c47e431cde88ecc6 SHA512 4ec5897436fde50c1b79ea235c89d512cba0e88affcd340188341e7f7335c443dcd132c794e9711d4c8fe329c47dd3502cc9e9772f4f43f49d3864469ba69048 WHIRLPOOL 8aa5b1385e71b9b0d0570e052adcd091601a0f80f0698ef374f29b0337d569804678c9635a29d95e92a1a4f3eacb5ae6d895df85bac6a0e491815da212e94100 -DIST uim-1.8.2.tar.bz2 6480613 SHA256 44c2003179291b3279dae7f911d638418a54910f2b99e58418acc88e10067835 SHA512 4433db6913611c753c896e89c79880b87bc55cf0888eefbc76f04e72f8b4d0bf3a97e355e9beeeb51f6dabdbeafaf575399562585b44717a660b8efac9ae80ab WHIRLPOOL 0b089785a5e0b12abbeb6edf7cb5dce162e15e1fef8ea17475511d0a95f733be616bf00dc2cebc6833dc611c31655d1ef5c5c584325ecf0160cbaf4f48a871cc -DIST uim-1.8.3.tar.bz2 6493892 SHA256 e701e01c3b75512de9ae5b451bdb0a5f49bb444186c31cd5a1ab4fbaed4b3b6e SHA512 28e7207ada6b12ee56017a620b6ebf03ce3eb02ebceec79f43236caf0bce4c3b6508c4d4c2cc3d1705b77d1033a3b47a0c9d0d0d78005217acb4b6ce8ee6bb99 WHIRLPOOL 33acf600f7f6126a04ac2cb1139e28cf1b3e47bc409822016b20f5dce8aa5ca04c8d44ac5985bf864f0fb451748df049077e221dd2d3456f520dbd4e4352a11a -DIST uim-1.8.4.tar.bz2 6494902 SHA256 16541b9dfe7e5b0f6c06d9b07a19e6b03de2d1dcee4669f8525e48dc552d683f SHA512 b804757f07f44212c0fbb494c2591536cdafd223fd12cce21da68c1273d14eb7156d4186eb96a3969edfc76cfb448d96cf45a9f7d59bd1dbf4c5faac754d95b7 WHIRLPOOL 5bc6a5ed58a140585089c697a54d8bdb5be52888f5c54fe46314e039094d7706814c4e43f64ce373b280e7790c8d851e5b0946ba5dcbb255c248dbd5ec28e060 DIST uim-1.8.6.tar.bz2 6500739 SHA256 7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b WHIRLPOOL 77362b5ac6bea217b4373184eb19d79c0b19a8c3f9c27945abccfd414d0409a33438a3cd1d1d2370b6b2f7154a6c35688ae4b2e57f50dc29524bf71938a38a28 diff --git a/app-i18n/uim/files/50uim-gentoo.el b/app-i18n/uim/files/50uim-gentoo.el deleted file mode 100644 index 350f6216139f..000000000000 --- a/app-i18n/uim/files/50uim-gentoo.el +++ /dev/null @@ -1,4 +0,0 @@ -;;; app-i18n/uim site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(autoload 'uim-mode "uim" nil t) diff --git a/app-i18n/uim/files/uim-1.7.3-glib-2.32.patch b/app-i18n/uim/files/uim-1.7.3-glib-2.32.patch deleted file mode 100644 index 7290240a8a9d..000000000000 --- a/app-i18n/uim/files/uim-1.7.3-glib-2.32.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit d9c316e49a03dcd5736eb04396657cc369eb6215 -Author: Muneyuki Noguchi -Date: Sat Apr 21 14:49:18 2012 +0900 - - Fix compile error with glib 2.32. - - * notify/uim-libnotify.c - - Don't include glib/gconvert.h directly. - -diff --git a/notify/uim-libnotify.c b/notify/uim-libnotify.c -index 414e74c..a6578a1 100644 ---- a/notify/uim-libnotify.c -+++ b/notify/uim-libnotify.c -@@ -37,7 +37,6 @@ - #include - #include - #include --#include - #include - - #include "uim.h" /* for uim_bool */ diff --git a/app-i18n/uim/files/uim-1.7.3-linguas.patch b/app-i18n/uim/files/uim-1.7.3-linguas.patch deleted file mode 100644 index 4eb737a5f1f1..000000000000 --- a/app-i18n/uim/files/uim-1.7.3-linguas.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/po/LINGUAS b/po/LINGUAS -index 4eb4f64..f85c7c7 100644 ---- a/po/LINGUAS -+++ b/po/LINGUAS -@@ -1 +1,3 @@ --fr ja ko -+fr -+ja -+ko diff --git a/app-i18n/uim/files/uim-1.8.0-glib2.32.patch b/app-i18n/uim/files/uim-1.8.0-glib2.32.patch deleted file mode 100644 index 8e8ed6307ecf..000000000000 --- a/app-i18n/uim/files/uim-1.8.0-glib2.32.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: uim-1.8.0/notify/uim-libnotify.c -=================================================================== ---- uim-1.8.0.orig/notify/uim-libnotify.c -+++ uim-1.8.0/notify/uim-libnotify.c -@@ -37,7 +37,6 @@ - #include - #include - #include --#include - #include - - #include "uim.h" /* for uim_bool */ diff --git a/app-i18n/uim/uim-1.7.3-r1.ebuild b/app-i18n/uim/uim-1.7.3-r1.ebuild deleted file mode 100644 index 6c7d32618382..000000000000 --- a/app-i18n/uim/uim-1.7.3-r1.ebuild +++ /dev/null @@ -1,251 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3-r1.ebuild,v 1.3 2014/01/29 01:47:37 naota Exp $ - -EAPI="4" -inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme - !app-i18n/uim-svn" -# >=dev-scheme/sigscheme-0.8.5 -# mana? ( app-i18n/mana ) -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# sj3? ( >=app-i18n/sj3-2.0.1.21 ) -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -pkg_setup() { - strip-linguas fr ja ko - if [[ -z "${LINGUAS}" ]]; then - # no linguas set, using the default one - LINGUAS=" " - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch \ - "${FILESDIR}"/${PN}-1.7.3-linguas.patch - - if has_version ">=dev-libs/glib-2.32"; then - epatch "${FILESDIR}"/${P}-glib-2.32.patch - fi - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die - - echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die - - #./autogen.sh - AT_NO_RECURSIVE=1 eautoreconf - cp po/Makefile.in.in qt/chardict/po || die - cp po/Makefile.in.in qt4/chardict/po || die -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" || die - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/app-i18n/uim/uim-1.7.3.ebuild b/app-i18n/uim/uim-1.7.3.ebuild deleted file mode 100644 index b047da144ae4..000000000000 --- a/app-i18n/uim/uim-1.7.3.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.7.3.ebuild,v 1.13 2014/01/29 01:47:37 naota Exp $ - -EAPI="4" -inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 hppa ppc ppc64 x86" -IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme - !app-i18n/uim-svn" -# >=dev-scheme/sigscheme-0.8.5 -# mana? ( app-i18n/mana ) -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# sj3? ( >=app-i18n/sj3-2.0.1.21 ) -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch - - if has_version ">=dev-libs/glib-2.32"; then - epatch "${FILESDIR}"/${P}-glib-2.32.patch - fi - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die - - echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die - - #./autogen.sh - AT_NO_RECURSIVE=1 eautoreconf - cp po/Makefile.in.in qt/chardict/po || die - cp po/Makefile.in.in qt4/chardict/po || die -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" || die - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk2 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/app-i18n/uim/uim-1.8.0-r1.ebuild b/app-i18n/uim/uim-1.8.0-r1.ebuild deleted file mode 100644 index 077150a0d97f..000000000000 --- a/app-i18n/uim/uim-1.8.0-r1.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0-r1.ebuild,v 1.3 2014/01/29 01:47:36 naota Exp $ - -EAPI="4" -inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme - !app-i18n/uim-svn" -# >=dev-scheme/sigscheme-0.8.5 -# mana? ( app-i18n/mana ) -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# sj3? ( >=app-i18n/sj3-2.0.1.21 ) -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -pkg_setup() { - strip-linguas fr ja ko - if [[ -z "${LINGUAS}" ]]; then - # no linguas set, using the default one - LINGUAS=" " - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch \ - "${FILESDIR}"/${PN}-1.8.0-glib2.32.patch \ - "${FILESDIR}"/${PN}-1.7.3-linguas.patch - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die - - echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die - - #./autogen.sh - AT_NO_RECURSIVE=1 eautoreconf -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" || die - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die - - rmdir "${ED}"/usr/share/doc/sigscheme || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/app-i18n/uim/uim-1.8.0.ebuild b/app-i18n/uim/uim-1.8.0.ebuild deleted file mode 100644 index 6b3f0ce070d9..000000000000 --- a/app-i18n/uim/uim-1.8.0.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.0.ebuild,v 1.12 2014/01/29 01:47:37 naota Exp $ - -EAPI="4" -inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 hppa ppc ppc64 x86" -IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme - !app-i18n/uim-svn" -# >=dev-scheme/sigscheme-0.8.5 -# mana? ( app-i18n/mana ) -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# sj3? ( >=app-i18n/sj3-2.0.1.21 ) -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch \ - "${FILESDIR}"/${PN}-1.8.0-glib2.32.patch - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die - - echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die - - #./autogen.sh - AT_NO_RECURSIVE=1 eautoreconf -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" || die - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die - - rmdir "${ED}"/usr/share/doc/sigscheme || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/app-i18n/uim/uim-1.8.2-r1.ebuild b/app-i18n/uim/uim-1.8.2-r1.ebuild deleted file mode 100644 index 6b9016287488..000000000000 --- a/app-i18n/uim/uim-1.8.2-r1.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.2-r1.ebuild,v 1.3 2014/01/29 01:47:37 naota Exp $ - -EAPI="4" -inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme - !app-i18n/uim-svn" -# >=dev-scheme/sigscheme-0.8.5 -# mana? ( app-i18n/mana ) -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# sj3? ( >=app-i18n/sj3-2.0.1.21 ) -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -pkg_setup() { - strip-linguas fr ja ko - if [[ -z "${LINGUAS}" ]]; then - # no linguas set, using the default one - LINGUAS=" " - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch \ - "${FILESDIR}"/${PN}-1.7.3-linguas.patch - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die - - echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die - - #./autogen.sh - AT_NO_RECURSIVE=1 eautoreconf -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" || die - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die - - rmdir "${ED}"/usr/share/doc/sigscheme || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/app-i18n/uim/uim-1.8.2.ebuild b/app-i18n/uim/uim-1.8.2.ebuild deleted file mode 100644 index fe6024ec4e0d..000000000000 --- a/app-i18n/uim/uim-1.8.2.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.2.ebuild,v 1.4 2014/01/29 01:47:37 naota Exp $ - -EAPI="4" -inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme - !app-i18n/uim-svn" -# >=dev-scheme/sigscheme-0.8.5 -# mana? ( app-i18n/mana ) -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# sj3? ( >=app-i18n/sj3-2.0.1.21 ) -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die - - echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die - - #./autogen.sh - AT_NO_RECURSIVE=1 eautoreconf -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" || die - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die - - rmdir "${ED}"/usr/share/doc/sigscheme || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/app-i18n/uim/uim-1.8.3-r1.ebuild b/app-i18n/uim/uim-1.8.3-r1.ebuild deleted file mode 100644 index cf161f01cb6b..000000000000 --- a/app-i18n/uim/uim-1.8.3-r1.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.3-r1.ebuild,v 1.3 2014/01/29 01:47:36 naota Exp $ - -EAPI="4" -inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme - !app-i18n/uim-svn" -# >=dev-scheme/sigscheme-0.8.5 -# mana? ( app-i18n/mana ) -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# sj3? ( >=app-i18n/sj3-2.0.1.21 ) -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -pkg_setup() { - strip-linguas fr ja ko - if [[ -z "${LINGUAS}" ]]; then - # no linguas set, using the default one - LINGUAS=" " - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch \ - "${FILESDIR}"/${PN}-1.7.3-linguas.patch - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die - - echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die - - #./autogen.sh - AT_NO_RECURSIVE=1 eautoreconf -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" || die - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die - - #rmdir "${ED}"/usr/share/doc/sigscheme || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/app-i18n/uim/uim-1.8.3.ebuild b/app-i18n/uim/uim-1.8.3.ebuild deleted file mode 100644 index 578dd0f5565b..000000000000 --- a/app-i18n/uim/uim-1.8.3.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.3.ebuild,v 1.4 2014/01/29 01:47:37 naota Exp $ - -EAPI="4" -inherit autotools eutils multilib elisp-common flag-o-matic - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme - !app-i18n/uim-svn" -# >=dev-scheme/sigscheme-0.8.5 -# mana? ( app-i18n/mana ) -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# sj3? ( >=app-i18n/sj3-2.0.1.21 ) -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die - - echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die - - #./autogen.sh - AT_NO_RECURSIVE=1 eautoreconf -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" || die - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die - - #rmdir "${ED}"/usr/share/doc/sigscheme || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/app-i18n/uim/uim-1.8.4-r1.ebuild b/app-i18n/uim/uim-1.8.4-r1.ebuild deleted file mode 100644 index bcb49e98283c..000000000000 --- a/app-i18n/uim/uim-1.8.4-r1.ebuild +++ /dev/null @@ -1,247 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.4-r1.ebuild,v 1.3 2014/01/29 01:47:37 naota Exp $ - -EAPI="4" -inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme - !app-i18n/uim-svn" -# >=dev-scheme/sigscheme-0.8.5 -# mana? ( app-i18n/mana ) -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# sj3? ( >=app-i18n/sj3-2.0.1.21 ) -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -pkg_setup() { - strip-linguas fr ja ko - if [[ -z "${LINGUAS}" ]]; then - # no linguas set, using the default one - LINGUAS=" " - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch \ - "${FILESDIR}"/${PN}-1.7.3-linguas.patch - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die - - echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die - - #./autogen.sh - AT_NO_RECURSIVE=1 eautoreconf -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" || die - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die - - #rmdir "${ED}"/usr/share/doc/sigscheme || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/app-i18n/uim/uim-1.8.4.ebuild b/app-i18n/uim/uim-1.8.4.ebuild deleted file mode 100644 index 8b84d8bc249c..000000000000 --- a/app-i18n/uim/uim-1.8.4.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.4.ebuild,v 1.4 2014/01/29 01:47:37 naota Exp $ - -EAPI="4" -inherit autotools eutils multilib elisp-common flag-o-matic gnome2-utils - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="+anthy canna curl eb emacs libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme - !app-i18n/uim-svn" -# >=dev-scheme/sigscheme-0.8.5 -# mana? ( app-i18n/mana ) -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# sj3? ( >=app-i18n/sj3-2.0.1.21 ) -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die - - echo "QMAKE_LFLAGS = ${LDFLAGS}" >> qt4/common.pro.in || die - - #./autogen.sh - AT_NO_RECURSIVE=1 eautoreconf -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE || die - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" || die - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die - - #rmdir "${ED}"/usr/share/doc/sigscheme || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/app-i18n/uim/uim-1.8.6.ebuild b/app-i18n/uim/uim-1.8.6.ebuild deleted file mode 100644 index bc54a8ff5f74..000000000000 --- a/app-i18n/uim/uim-1.8.6.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.8.6.ebuild,v 1.2 2014/04/14 14:27:44 jer Exp $ - -EAPI="5" -inherit autotools eutils multilib elisp-common gnome2-utils - -DESCRIPTION="Simple, secure and flexible input method library" -HOMEPAGE="http://code.google.com/p/uim/" -SRC_URI="http://uim.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86" -IUSE="+anthy canna curl eb emacs expat libffi gnome gtk gtk3 kde libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs test unicode X xft linguas_zh_CN linguas_zh_TW linguas_ja linguas_ko" - -RESTRICT="test" - -REQUIRED_USE="gtk? ( X ) qt4? ( X )" - -RDEPEND="X? ( - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXrender - ) - anthy? ( - unicode? ( >=app-i18n/anthy-8622 ) - !unicode? ( app-i18n/anthy ) - ) - canna? ( app-i18n/canna ) - curl? ( >=net-misc/curl-7.16.4 ) - eb? ( dev-libs/eb ) - emacs? ( virtual/emacs ) - expat? ( dev-libs/expat ) - libffi? ( virtual/libffi ) - gnome? ( >=gnome-base/gnome-panel-2.14 ) - gtk? ( >=x11-libs/gtk+-2.4:2 ) - gtk3? ( x11-libs/gtk+:3 ) - kde? ( >=kde-base/kdelibs-4 ) - libedit? ( dev-libs/libedit ) - libnotify? ( >=x11-libs/libnotify-0.4 ) - m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) - ncurses? ( sys-libs/ncurses ) - nls? ( virtual/libintl ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - skk? ( app-i18n/skk-jisyo ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl ) - !dev-scheme/sigscheme" -# scim? ( >=app-i18n/scim-1.3.0 ) # broken -# wnn? ( app-i18n/wnn ) -# gnome? ( -# gtk? ( >=gnome-base/gnome-panel-2.14 ) -# gtk3? ( >=gnome-base/gnome-panel-3 ) -# ) - -DEPEND="${RDEPEND} - dev-util/intltool - virtual/pkgconfig - >=sys-devel/gettext-0.15 - kde? ( dev-util/cmake ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -RDEPEND="${RDEPEND} - X? ( - media-fonts/font-sony-misc - linguas_zh_CN? ( - || ( media-fonts/font-isas-misc media-fonts/intlfonts ) - ) - linguas_zh_TW? ( - media-fonts/intlfonts - ) - linguas_ja? ( - || ( media-fonts/font-jis-misc media-fonts/intlfonts ) - ) - linguas_ko? ( - || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) - ) - )" -# test? ( dev-scheme/gauche ) - -SITEFILE=50${PN}-gentoo.el - -pkg_setup() { - strip-linguas fr ja ko - if [[ -z "${LINGUAS}" ]]; then - # no linguas set, using the default one - LINGUAS=" " - fi -} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.0-gentoo.patch \ - "${FILESDIR}"/${PN}-1.5.4-zhTW.patch - - # bug 275420 - sed -i -e "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac || die "sed failed!" - - AT_NO_RECURSIVE=1 eautoreconf -} - -src_configure() { - local myconf - - if (use gtk || use gtk3) && (use anthy || use canna) ; then - myconf="${myconf} --enable-dict" - else - myconf="${myconf} --disable-dict" - fi - - if use gtk || use gtk3 || use qt4 ; then - myconf="${myconf} --enable-pref" - else - myconf="${myconf} --disable-pref" - fi - - if use anthy ; then - if use unicode ; then - myconf="${myconf} --with-anthy-utf8" - else - myconf="${myconf} --with-anthy" - fi - else - myconf="${myconf} --without-anthy" - fi - - if use libnotify ; then - myconf="${myconf} --enable-notify=libnotify" - fi - - #if use gnome ; then - # myconf="${myconf} $(use_enable gtk gnome-applet)" - # myconf="${myconf} $(use_enable gtk3 gnome3-applet)" - #fi - - econf $(use_with X x) \ - $(use_with canna) \ - $(use_with curl) \ - $(use_with eb) \ - $(use_enable emacs) \ - $(use_with emacs lispdir "${SITELISP}") \ - $(use_with expat) \ - $(use_with libffi ffi) \ - $(use_enable gnome gnome-applet) \ - $(use_with gtk gtk2) \ - $(use_with gtk3) \ - $(use_with libedit) \ - --disable-kde-applet \ - $(use_enable kde kde4-applet) \ - $(use_with m17n-lib m17nlib) \ - $(use_enable ncurses fep) \ - $(use_enable nls) \ - --without-qt \ - --without-qt-immodule \ - $(use_with qt4 qt4) \ - $(use_with qt4 qt4-immodule) \ - $(use_enable qt4 qt4-qt3support) \ - $(use_with skk) \ - $(use_with sqlite sqlite3) \ - $(use_enable ssl openssl) \ - $(use_enable static-libs static) \ - $(use_with xft) \ - ${myconf} -} - -src_compile() { - default - - if use emacs; then - cd emacs - elisp-compile *.el || die "elisp-compile failed!" - fi -} - -src_install() { - # parallel make install b0rked, bug #222677 - emake -j1 INSTALL_ROOT="${D}" DESTDIR="${D}" install - - dodoc AUTHORS ChangeLog* NEWS README RELNOTE - if use emacs; then - elisp-install uim-el emacs/*.elc || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el \ - || die "elisp-site-file-install failed!" - fi - - find "${ED}/usr/$(get_libdir)/uim" -name '*.la' -exec rm {} + - use static-libs || find "${ED}" -name '*.la' -exec rm {} + - - sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-uim" > "${T}/uim.conf" || die "sed failed!" - insinto /etc/X11/xinit/xinput.d - doins "${T}/uim.conf" - - # collision with dev-scheme/sigscheme, bug #330975 - # find "${ED}" -name '*gcroots*' -delete || die - - #rmdir "${ED}"/usr/share/doc/sigscheme || die -} - -pkg_postinst() { - elog - elog "New input method switcher has been introduced. You need to set" - elog - elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE" - elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE" - elog "% XMODIFIERS=@im=uim ; export XMODIFIERS" - elog - elog "If you would like to use uim-anthy as default input method, put" - elog "(define default-im-name 'anthy)" - elog "to your ~/.uim." - elog - elog "All input methods can be found by running uim-im-switcher-gtk, " - elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4." - elog - elog "If you upgrade from a version of uim older than 1.4.0," - elog "you should run revdep-rebuild." - - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - if use emacs; then - elisp-site-regen - echo - elog "uim is autoloaded with Emacs with a minimal set of features:" - elog "There is no keybinding defined to call it directly, so please" - elog "create one yourself and choose an input method." - elog "Integration with LEIM is not done with this ebuild, please have" - elog "a look at the documentation how to achieve this." - fi -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk2 - use gtk3 && gnome2_query_immodules_gtk3 - use emacs && elisp-site-regen -} diff --git a/dev-dotnet/gtkhtml-sharp/Manifest b/dev-dotnet/gtkhtml-sharp/Manifest deleted file mode 100644 index cf696106baca..000000000000 --- a/dev-dotnet/gtkhtml-sharp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-desktop-sharp-2.26.0.tar.bz2 313134 SHA256 577148d0937d91997341e8b2d2e8aadb0a5f1d898ca9bf579b114097c509aa67 SHA512 e7c220b16fd51512c87bc3c6f96604af47d95fa5560c5e7b264619fa65c8bce5b4fc89978c23b7dfd18b4fa090ee5e7f4696932f36bcb0e7782776505fe5f64e WHIRLPOOL 6d3ca3b2537644629ed20b8d17c6364ffb14e4472d2d316f19c81e4a655307ffc49659de60ce8ecc943cd3f115e5e673ef86ccaa8d5cf81fd644121c58df6c21 diff --git a/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.26.0.ebuild b/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.26.0.ebuild deleted file mode 100644 index 2be72b5618b2..000000000000 --- a/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.26.0.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtkhtml-sharp/gtkhtml-sharp-2.26.0.ebuild,v 1.4 2011/11/10 19:15:32 xarthisius Exp $ - -EAPI=2 - -GTK_SHARP_REQUIRED_VERSION="2.12" - -inherit versionator gtk-sharp-module - -SLOT="2" -KEYWORDS="amd64 ppc x86" -IUSE="" - -RESTRICT="test" diff --git a/dev-dotnet/gtkhtml-sharp/metadata.xml b/dev-dotnet/gtkhtml-sharp/metadata.xml deleted file mode 100644 index e01adbb307db..000000000000 --- a/dev-dotnet/gtkhtml-sharp/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - dotnet - diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest index e44bef31a1c1..933a2484a077 100644 --- a/dev-libs/libgdata/Manifest +++ b/dev-libs/libgdata/Manifest @@ -1,4 +1,2 @@ DIST libgdata-0.14.3.tar.xz 1476520 SHA256 c044f2af34c1e5eba7b74d5809f6f0bc4acc7007f23c4cb7ebccf94d5058ad8a SHA512 8c4cdac5f4cb591b979d3f1585b67d5e683772440a2920d5f1e9733a21435e1dc8d86d98c70694c92219b489ef640805cd38c45b3f1823026d21229eded36ea0 WHIRLPOOL d29920886f81396311949813a469972380b23932e1aec4bcadc29655203e53b4ddb074b901da313b356c5c4be124ac6008317696252c4fb87eb40c37dd6a33f0 -DIST libgdata-0.16.0.tar.xz 1552500 SHA256 66bc279ff8fbebb8eb2602d33e37e3140747ba1e4dc1f1b944c0f312f00ab479 SHA512 cca81a2400d637d017e90f22de80dd065f8568d3faafa17f6684e1f4c326ba162adb45aaea0558aa64068bf9545e51fb455d0f25f502a46b3ee2f0533ff95d65 WHIRLPOOL 2916bbd9d50ff636c6649f7b51b715489c86f77e154c3480549b0c90905e42ae80a8b8a30003a032655e7f18ae0eb405e32a2846c69686b1a7f2b980d04b7356 DIST libgdata-0.16.1.tar.xz 1551960 SHA256 8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827 SHA512 81fd252e24ba0068b401e3de61b4a23575dae0790f4caf646e56a57aab815a70a207b2492efa4213f51ac1d7c752d4ec0c1c9a35d7109f6a63668af05e142039 WHIRLPOOL 892a7823a85bc771b502f7b564156eaede676c3e2cf7406e9b808a3f4fbfa6e9be1ad1ec1cb79ca1b42dc0bf54f6d46560e2a863e8861f186802a91f91de2d4d -DIST libgdata-0.8.1.tar.bz2 1201616 SHA256 080be3e677e6098d0f1bbcbaf8e474b4b94fad8a0d07b5a2969c3ab95b68d0b9 SHA512 61d65ceae7b82a497ba4c2c70a0486a108ae8dec9f0d7885fac8d33dd6a4f4d1eff068e39fb2ec5fed69f349de4d393adceca0ee242f2b4cb6045dbd48743643 WHIRLPOOL 0551ddcb3d9abb3e3633ffcb98e67036d5bdb914d3e95405b7c5568b471784548d02d3f4b0c4df4f76d2396a2be6400d564afc10527c2aa5ada9f812609ab8b0 diff --git a/dev-libs/libgdata/files/libgdata-0.8.1-empty-names.patch b/dev-libs/libgdata/files/libgdata-0.8.1-empty-names.patch deleted file mode 100644 index 1eef41eb1de0..000000000000 --- a/dev-libs/libgdata/files/libgdata-0.8.1-empty-names.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 400a4e74f5a506ddff07605a93aa7412262fea38 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Tue, 19 Apr 2011 08:13:01 +0000 -Subject: Bug 648058 — Doesn't allow empty names for user defined fields - -Allow Google Contacts' user defined fields to have empty names. Test cases -updated. Closes: bgo#648058 ---- -diff --git a/gdata/services/contacts/gdata-contacts-contact.c b/gdata/services/contacts/gdata-contacts-contact.c -index bedb2c8..33b20c6 100644 ---- a/gdata/services/contacts/gdata-contacts-contact.c -+++ b/gdata/services/contacts/gdata-contacts-contact.c -@@ -896,8 +896,9 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da - /* gContact:userDefinedField */ - xmlChar *name, *value; - -+ /* Note that while we require the property to be present, we don't require it to be non-empty. See bgo#648058 */ - name = xmlGetProp (node, (xmlChar*) "key"); -- if (name == NULL || *name == '\0') { -+ if (name == NULL) { - xmlFree (name); - return gdata_parser_error_required_property_missing (node, "key", error); - } -@@ -2843,6 +2844,8 @@ gdata_contacts_contact_set_extended_property (GDataContactsContact *self, const - * Gets the value of a user-defined field of the contact. User-defined fields are settable by the user through the Google Contacts web interface, - * in contrast to extended properties, which are visible and settable only through the GData interface. - * -+ * The @name of the field may not be %NULL, but may be an empty string. -+ * - * Return value: the field's value, or %NULL - * - * Since: 0.7.0 -@@ -2851,7 +2854,7 @@ const gchar * - gdata_contacts_contact_get_user_defined_field (GDataContactsContact *self, const gchar *name) - { - g_return_val_if_fail (GDATA_IS_CONTACTS_CONTACT (self), NULL); -- g_return_val_if_fail (name != NULL && *name != '\0', NULL); -+ g_return_val_if_fail (name != NULL, NULL); - return g_hash_table_lookup (self->priv->user_defined_fields, name); - } - -@@ -2881,6 +2884,8 @@ gdata_contacts_contact_get_user_defined_fields (GDataContactsContact *self) - * Sets the value of a contact's user-defined field. User-defined field names are unique (but of the client's choosing), - * and reusing the same field name will result in the old value of that field being overwritten. - * -+ * The @name of the field may not be %NULL, but may be an empty string. -+ * - * To unset a field, set @value to %NULL. - * - * Since: 0.7.0 -@@ -2889,7 +2894,7 @@ void - gdata_contacts_contact_set_user_defined_field (GDataContactsContact *self, const gchar *name, const gchar *value) - { - g_return_if_fail (GDATA_IS_CONTACTS_CONTACT (self)); -- g_return_if_fail (name != NULL && *name != '\0'); -+ g_return_if_fail (name != NULL); - - if (value == NULL) { - /* Removing a field */ -diff --git a/gdata/tests/contacts.c b/gdata/tests/contacts.c -index e22184f..37c0a68 100644 ---- a/gdata/tests/contacts.c -+++ b/gdata/tests/contacts.c -@@ -276,6 +276,7 @@ test_insert_simple (gconstpointer service) - gdata_contacts_contact_set_user_defined_field (contact, "Favourite colour", "Blue"); - gdata_contacts_contact_set_user_defined_field (contact, "Owes me", "£10"); - gdata_contacts_contact_set_user_defined_field (contact, "My notes", ""); -+ gdata_contacts_contact_set_user_defined_field (contact, "", "Foo"); /* bgo#648058 */ - - /* Check the properties of the object */ - g_object_get (G_OBJECT (contact), -@@ -374,6 +375,7 @@ test_insert_simple (gconstpointer service) - "" - "" - "" -+ "" /* bgo#648058 */ - "Rowing" - "Big J" - "" -@@ -510,10 +512,11 @@ test_insert_simple (gconstpointer service) - g_assert_cmpstr (gdata_contacts_contact_get_user_defined_field (new_contact, "Favourite colour"), ==, "Blue"); - g_assert_cmpstr (gdata_contacts_contact_get_user_defined_field (new_contact, "Owes me"), ==, "£10"); - g_assert_cmpstr (gdata_contacts_contact_get_user_defined_field (new_contact, "My notes"), ==, ""); -+ g_assert_cmpstr (gdata_contacts_contact_get_user_defined_field (new_contact, ""), ==, "Foo"); - - properties = gdata_contacts_contact_get_user_defined_fields (new_contact); - g_assert (properties != NULL); -- g_assert_cmpuint (g_hash_table_size (properties), ==, 3); -+ g_assert_cmpuint (g_hash_table_size (properties), ==, 4); - - /* Groups */ - list = gdata_contacts_contact_get_groups (new_contact); -@@ -1298,7 +1301,6 @@ test_parser_error_handling (void) - TEST_XML_ERROR_HANDLING (""); /* no key or value */ - TEST_XML_ERROR_HANDLING (""); /* no value */ - TEST_XML_ERROR_HANDLING (""); /* no key */ -- TEST_XML_ERROR_HANDLING (""); /* empty key */ - - /* gContact:groupMembershipInfo */ - TEST_XML_ERROR_HANDLING (""); --- -cgit v0.9 diff --git a/dev-libs/libgdata/files/libgdata-0.8.1-gdata-symbols.patch b/dev-libs/libgdata/files/libgdata-0.8.1-gdata-symbols.patch deleted file mode 100644 index 0477b5678101..000000000000 --- a/dev-libs/libgdata/files/libgdata-0.8.1-gdata-symbols.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 60330e8a42e80c4dd647c55a4b99c44d67cedfc0 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Mon, 15 Aug 2011 22:15:57 +0100 -Subject: [PATCH] core: Add missing symbols to symbols file - -Closes: bgo#656529 ---- - gdata/gdata.symbols | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/gdata/gdata.symbols b/gdata/gdata.symbols -index 1220ce9..a2d0590 100644 ---- a/gdata/gdata.symbols -+++ b/gdata/gdata.symbols -@@ -94,6 +94,7 @@ gdata_query_get_etag - gdata_query_set_etag - gdata_youtube_standard_feed_type_get_type - gdata_youtube_service_error_get_type -+gdata_youtube_service_error_quark - gdata_youtube_service_get_type - gdata_youtube_service_new - gdata_youtube_service_query_standard_feed -@@ -646,6 +647,7 @@ gdata_documents_query_get_reader_addresses - gdata_documents_query_add_reader - gdata_documents_query_add_collaborator - gdata_documents_service_error_get_type -+gdata_documents_service_error_quark - gdata_download_stream_get_type - gdata_download_stream_new - gdata_download_stream_get_service --- -1.7.8.rc1 - diff --git a/dev-libs/libgdata/files/libgdata-0.8.1-validate-ssl.patch b/dev-libs/libgdata/files/libgdata-0.8.1-validate-ssl.patch deleted file mode 100644 index a018604d0545..000000000000 --- a/dev-libs/libgdata/files/libgdata-0.8.1-validate-ssl.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 25a2824203ad199d69432940d2f1edda5b226e9e Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Thu, 8 Mar 2012 00:09:08 +0000 -Subject: [PATCH] core: Validate SSL certificates for all connections - -This prevents MitM attacks which use spoofed SSL certificates. - -Closes: https://bugzilla.gnome.org/show_bug.cgi?id=671535 - -[Alexandre Rostovtsev : backport to 0.8.1] - -Conflicts: - - gdata/gdata-service.c ---- - configure.ac | 7 +++++++ - gdata/gdata-service.c | 2 +- - 2 files changed, 8 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 449383d..ad23761 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -92,6 +92,13 @@ AC_CHECK_FUNCS([strtol]) - AC_CHECK_FUNCS([strtoul]) - AC_CHECK_HEADERS([sys/time.h]) - -+# System SSL CA certificates -+AC_ARG_WITH(ca-certs, -+ AS_HELP_STRING([--with-ca-certs=PATH],[location of SSL CA certificates (default: /etc/ssl/certs/ca-certificates.crt)]), -+ ca_certs="$withval", -+ ca_certs="/etc/ssl/certs/ca-certificates.crt") -+AC_DEFINE_UNQUOTED(CA_CERTS, "$ca_certs", [Where to look for SSL CA certificates]) -+ - # Internationalisation support - GETTEXT_PACKAGE=gdata - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name]) -diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c -index 420eec2..8d8d21c 100644 ---- a/gdata/gdata-service.c -+++ b/gdata/gdata-service.c -@@ -273,7 +273,7 @@ static void - gdata_service_init (GDataService *self) - { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GDATA_TYPE_SERVICE, GDataServicePrivate); -- self->priv->session = soup_session_sync_new (); -+ self->priv->session = soup_session_sync_new_with_options (SOUP_SESSION_SSL_CA_FILE, CA_CERTS, NULL); - - #ifdef HAVE_GNOME - soup_session_add_feature_by_type (self->priv->session, SOUP_TYPE_GNOME_FEATURES_2_26); --- -1.7.8.5 - diff --git a/dev-libs/libgdata/libgdata-0.16.0.ebuild b/dev-libs/libgdata/libgdata-0.16.0.ebuild deleted file mode 100644 index be882e327d49..000000000000 --- a/dev-libs/libgdata/libgdata-0.16.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.16.0.ebuild,v 1.4 2014/10/24 14:19:00 blueness Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -VALA_MIN_API_VERSION="0.20" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 vala - -DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol" -HOMEPAGE="https://wiki.gnome.org/Projects/libgdata" - -LICENSE="LGPL-2.1+" -SLOT="0/19" # subslot = libgdata soname version -IUSE="gnome +introspection static-libs vala" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -REQUIRED_IUSE="vala? ( introspection )" - -# gtk+ is needed for gdk -# configure checks for gtk:3, but only uses it for demos which are not installed -RDEPEND=" - >=dev-libs/glib-2.32:2 - >=dev-libs/json-glib-0.15 - >=dev-libs/libxml2-2:2 - >=net-libs/liboauth-0.9.4 - >=net-libs/libsoup-2.42.0:2.4[introspection?] - net-libs/uhttpmock - >=x11-libs/gdk-pixbuf-2.14:2 - gnome? ( - app-crypt/gcr:= - >=net-libs/gnome-online-accounts-3.8 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40 - >=gnome-base/gnome-common-3.6 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -src_prepare() { - # Disable tests requiring network access, bug #307725 - sed -e '/^TEST_PROGS = / s:\(.*\):TEST_PROGS = general perf calendar client-login-authorizer contacts documents oauth1-authorizer picasaweb youtube \nOLD_\1:' \ - -i gdata/tests/Makefile.in || die "network test disable failed" - - vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - DOCS="AUTHORS ChangeLog HACKING NEWS README" - gnome2_src_configure \ - $(use_enable gnome) \ - $(use_enable gnome goa) \ - $(use_enable introspection) \ - $(use_enable vala) \ - $(use_enable static-libs static) -} - -src_test() { - unset ORBIT_SOCKETDIR - unset DBUS_SESSION_BUS_ADDRESS - export GSETTINGS_BACKEND="memory" #486412 - dbus-launch emake check -} diff --git a/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild b/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild deleted file mode 100644 index a97a233c6ff8..000000000000 --- a/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild,v 1.9 2012/12/19 04:08:55 tetromino Exp $ - -EAPI="3" -GCONF_DEBUG="yes" - -inherit autotools eutils gnome2 - -DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol" -HOMEPAGE="http://live.gnome.org/libgdata" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" -IUSE="gnome +introspection" - -# gtk+ is needed for gdk -RDEPEND=">=dev-libs/glib-2.19:2 - || ( - >=x11-libs/gdk-pixbuf-2.14:2 - >=x11-libs/gtk+-2.14:2 ) - app-misc/ca-certificates - >=dev-libs/libxml2-2:2 - >=net-libs/libsoup-2.26.1:2.4[introspection?] - gnome? ( >=net-libs/libsoup-gnome-2.26.1:2.4[introspection?] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.7 )" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.40 - gnome-base/gnome-common" -# eautoreconf requires gnome-base/gnome-common - -pkg_setup() { - DOCS="AUTHORS ChangeLog HACKING NEWS README" - G2CONF="${G2CONF} - --disable-static - --with-ca-certs=${EPREFIX}/etc/ssl/certs/ca-certificates.crt - $(use_enable gnome) - $(use_enable introspection)" -} - -src_prepare() { - # Allow Google Contacts' user defined fields to have empty names, upstream bug #648058 - epatch "${FILESDIR}/${P}-empty-names.patch" - - # Fix building with gobject-introspection-1.30; fixed in 0.10.x - epatch "${FILESDIR}/${P}-gdata-symbols.patch" - - # Fix MITM attack, bug #408245 - epatch "${FILESDIR}/${P}-validate-ssl.patch" - - AT_M4DIR=. eautoreconf - gnome2_src_prepare - - # Disable tests requiring network access, bug #307725 - sed -e '/^TEST_PROGS = / s:\(.*\):TEST_PROGS = general perf\nOLD_\1:' \ - -i gdata/tests/Makefile.in || die "network test disable failed" -} - -src_test() { - unset ORBIT_SOCKETDIR - unset DBUS_SESSION_BUS_ADDRESS - dbus-launch emake check || die "emake check failed" -} - -pkg_preinst() { - gnome2_pkg_preinst - preserve_old_lib /usr/$(get_libdir)/libgdata.so.7 -} - -pkg_postinst() { - gnome2_pkg_postinst - preserve_old_lib_notify /usr/$(get_libdir)/libgdata.so.7 -} diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest index 7122a9ebf5a4..2317f621ff65 100644 --- a/dev-libs/libgweather/Manifest +++ b/dev-libs/libgweather/Manifest @@ -1,3 +1,2 @@ -DIST libgweather-2.30.3.tar.bz2 7449487 SHA256 b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c SHA512 4cbed97a65d02dfdb015fced22cc58d681cd508473add0fc9060206e2736e2c97aa80d3a70923a6e46e0f8de566baffbd56bb86faa875fa565ae52630a05a071 WHIRLPOOL fc000d21f5772f3852f1de5eaf7ebab42f3deabc30ac1a96f12b40a2ba9c864afdf9d0fe01809cdbcd0749b9bd5e37a5c177df199bf5847b2c5ec6cf1cd9cdb0 DIST libgweather-3.12.2.tar.xz 3985056 SHA256 54ef096350d7774ab1b3f23ed768246301cdcedfaa762a2c46920bf87fcc1c37 SHA512 04e3e7be923813e1dedca90931a12270b6e6d9b0329c35f8dbc0398f0a413e0511dcaa7aab7191b8e72c66b929f381c9cd810702cefb35ea0d79c3af0a6db5d2 WHIRLPOOL 384dada98adc101414063e3d6301e821abf79261d00e9532e2287643963d0556da254e9bcbfbb183eb36b8acde1278c31904dd75bb2eaf92d16fa6926ebb8846 DIST libgweather-3.12.3.tar.xz 3982352 SHA256 89f65b1ffb84775c2d73e8daa67dd97f930afe73bae57985ade1e9e37019b435 SHA512 30b0bf57a3ddc090156f3abacd19168f1a3e4eb661e4113eac15f5acb231eb369187806ec6b61518e330b5185d4d9269f5421be056d7502fa700a4379bd9294f WHIRLPOOL 181f51c2a4cafb69ccc7ace69ecff8c61dd9c98de4c1acddc3c460c561f3ee6289dbd9f13f51da7eb3e57bc9122723bdec14cd5acfea0cf1df6ead4bf7a84a95 diff --git a/dev-libs/libgweather/files/libgweather-2.30.0-fix-automagic-python-support.patch b/dev-libs/libgweather/files/libgweather-2.30.0-fix-automagic-python-support.patch deleted file mode 100644 index 77f2f94eb5cf..000000000000 --- a/dev-libs/libgweather/files/libgweather-2.30.0-fix-automagic-python-support.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 03626e45436b0b9c345e0c07e4f488375639877a Mon Sep 17 00:00:00 2001 -From: Romain Perier -Date: Sat, 19 Sep 2009 20:54:32 +0200 -Subject: [PATCH] Fix automagic python support when --disable-python is given on the command line - ---- - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index f363571..743fe9d 100644 ---- a/configure.in -+++ b/configure.in -@@ -215,7 +215,7 @@ dnl *************************************************************************** - AC_ARG_ENABLE(python, - [AC_HELP_STRING([--enable-python], - [Build libgweather python bindings])], -- [enable_python=yes], -+ [enable_python=$enableval], - [enable_python=no]) - if test "$enable_python" = "yes"; then - AM_PATH_PYTHON() --- -1.6.5.rc1 diff --git a/dev-libs/libgweather/libgweather-2.30.3.ebuild b/dev-libs/libgweather/libgweather-2.30.3.ebuild deleted file mode 100644 index 13be1c4df784..000000000000 --- a/dev-libs/libgweather/libgweather-2.30.3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgweather/libgweather-2.30.3.ebuild,v 1.16 2012/12/19 01:53:47 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME_TARBALL_SUFFIX="bz2" -PYTHON_DEPEND="python? 2" - -inherit autotools eutils gnome2 python - -DESCRIPTION="Library to access weather information from online services" -HOMEPAGE="https://live.gnome.org/LibGWeather" - -LICENSE="GPL-2+" -SLOT="2" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="python" - -# libsoup-gnome is to be used because libsoup[gnome] might not -# get libsoup-gnome installed by the time ${P} is built -RDEPEND=">=x11-libs/gtk+-2.11:2 - >=dev-libs/glib-2.13:2 - >=gnome-base/gconf-2.8:2 - >=net-libs/libsoup-gnome-2.25.1:2.4 - >=dev-libs/libxml2-2.6.0:2 - >=sys-libs/timezone-data-2010k - python? ( - >=dev-python/pygobject-2:2 - >=dev-python/pygtk-2 ) - ! - - -gnome - diff --git a/dev-python/bug-buddy-python/Manifest b/dev-python/bug-buddy-python/Manifest deleted file mode 100644 index b3c5fb4b1ca1..000000000000 --- a/dev-python/bug-buddy-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e diff --git a/dev-python/bug-buddy-python/bug-buddy-python-2.32.0-r1.ebuild b/dev-python/bug-buddy-python/bug-buddy-python-2.32.0-r1.ebuild deleted file mode 100644 index 3c6cf769e227..000000000000 --- a/dev-python/bug-buddy-python/bug-buddy-python-2.32.0-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/bug-buddy-python/bug-buddy-python-2.32.0-r1.ebuild,v 1.1 2014/05/26 18:21:10 mgorny Exp $ - -EAPI="5" - -GNOME_ORG_MODULE="gnome-python-desktop" -G_PY_BINDINGS="bugbuddy" -PYTHON_COMPAT=( python2_7 ) - -inherit gnome-python-common-r1 - -DESCRIPTION="Python bindings for Bug Buddy" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=gnome-extra/bug-buddy-2.16:2 - ! - - -gnome - diff --git a/dev-python/evince-python/Manifest b/dev-python/evince-python/Manifest deleted file mode 100644 index b3c5fb4b1ca1..000000000000 --- a/dev-python/evince-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e diff --git a/dev-python/evince-python/evince-python-2.32.0-r1.ebuild b/dev-python/evince-python/evince-python-2.32.0-r1.ebuild deleted file mode 100644 index 57f72262189c..000000000000 --- a/dev-python/evince-python/evince-python-2.32.0-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/evince-python/evince-python-2.32.0-r1.ebuild,v 1.1 2014/05/26 18:47:31 mgorny Exp $ - -EAPI="5" - -GNOME_ORG_MODULE="gnome-python-desktop" -PYTHON_COMPAT=( python2_7 ) - -inherit gnome-python-common-r1 - -DESCRIPTION="Python bindings for Evince" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND="=app-text/evince-2.32 - ! - - -gnome - - - - diff --git a/dev-python/evolution-python/Manifest b/dev-python/evolution-python/Manifest deleted file mode 100644 index b3c5fb4b1ca1..000000000000 --- a/dev-python/evolution-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e diff --git a/dev-python/evolution-python/evolution-python-2.32.0-r1.ebuild b/dev-python/evolution-python/evolution-python-2.32.0-r1.ebuild deleted file mode 100644 index b4aeda52b2dc..000000000000 --- a/dev-python/evolution-python/evolution-python-2.32.0-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/evolution-python/evolution-python-2.32.0-r1.ebuild,v 1.1 2014/05/26 18:51:42 mgorny Exp $ - -EAPI="5" - -GNOME_ORG_MODULE="gnome-python-desktop" -G_PY_BINDINGS=( evolution evolution_ecal ) -PYTHON_COMPAT=( python2_7 ) - -inherit gnome-python-common-r1 - -DESCRIPTION="Python bindings for Evolution and Evolution Data Server" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND="dev-python/libbonobo-python:2[${PYTHON_USEDEP}] - - - -gnome - diff --git a/dev-python/gnome-applets-python/Manifest b/dev-python/gnome-applets-python/Manifest deleted file mode 100644 index b3c5fb4b1ca1..000000000000 --- a/dev-python/gnome-applets-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e diff --git a/dev-python/gnome-applets-python/files/gnome-applets-python-2.26.0-session-mgmt.patch b/dev-python/gnome-applets-python/files/gnome-applets-python-2.26.0-session-mgmt.patch deleted file mode 100644 index 6d6646019464..000000000000 --- a/dev-python/gnome-applets-python/files/gnome-applets-python-2.26.0-session-mgmt.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- - Add missing GNOME_CLIENT_PARAM_SM_CONNECT, FALSE in gnomeapplet module. Closes #579390. - - gnomeapplet/applet.override | 1 + - gnomeapplet/applet.override | 2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/gnomeapplet/applet.override b/gnomeapplet/applet.override -index 809da77..a203097 100644 ---- a/gnomeapplet/applet.override -+++ b/gnomeapplet/applet.override -@@ -5,7 +5,7 @@ headers - #include - #include - #include --#include -+#include - - #define NO_IMPORT_PYGOBJECT - #include "pygobject.h" -@@ -102,6 +102,7 @@ _wrap_panel__applet_bonobo_factory (PyGObject * self, - LIBGNOMEUI_MODULE, - argc, argv, - GNOME_PARAM_NONE, -+ GNOME_CLIENT_PARAM_SM_CONNECT, FALSE, - NULL); - - pyg_begin_allow_threads; diff --git a/dev-python/gnome-applets-python/gnome-applets-python-2.32.0-r1.ebuild b/dev-python/gnome-applets-python/gnome-applets-python-2.32.0-r1.ebuild deleted file mode 100644 index be92f38ea6dd..000000000000 --- a/dev-python/gnome-applets-python/gnome-applets-python-2.32.0-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-applets-python/gnome-applets-python-2.32.0-r1.ebuild,v 1.1 2014/05/26 18:05:06 mgorny Exp $ - -EAPI="5" - -GNOME_ORG_MODULE="gnome-python-desktop" -G_PY_BINDINGS="applet" -PYTHON_COMPAT=( python2_7 ) - -inherit gnome-python-common-r1 - -DESCRIPTION="Python bindings for writing GNOME applets" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="examples" - -RDEPEND=">=gnome-base/gnome-panel-2.13.4 - >=dev-python/libbonobo-python-2.22.0:2[${PYTHON_USEDEP}] - gnome-base/libgnome - gnome-base/libgnomeui - ! - - -gnome - diff --git a/dev-python/gnome-desktop-python/Manifest b/dev-python/gnome-desktop-python/Manifest deleted file mode 100644 index b3c5fb4b1ca1..000000000000 --- a/dev-python/gnome-desktop-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e diff --git a/dev-python/gnome-desktop-python/gnome-desktop-python-2.32.0-r1.ebuild b/dev-python/gnome-desktop-python/gnome-desktop-python-2.32.0-r1.ebuild deleted file mode 100644 index ce9d81e597bf..000000000000 --- a/dev-python/gnome-desktop-python/gnome-desktop-python-2.32.0-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-desktop-python/gnome-desktop-python-2.32.0-r1.ebuild,v 1.1 2014/05/26 18:05:04 mgorny Exp $ - -EAPI="5" - -GNOME_ORG_MODULE="gnome-python-desktop" -G_PY_BINDINGS="gnomedesktop" -PYTHON_COMPAT=( python2_7 ) - -inherit gnome-python-common-r1 - -DESCRIPTION="Python bindings for some GNOME desktop libraries" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=gnome-base/gnome-desktop-2.10.0:2 - >=dev-python/gnome-vfs-python-2.22:2[${PYTHON_USEDEP}] - ! - - -gnome - diff --git a/dev-python/gnome-media-python/Manifest b/dev-python/gnome-media-python/Manifest deleted file mode 100644 index b3c5fb4b1ca1..000000000000 --- a/dev-python/gnome-media-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e diff --git a/dev-python/gnome-media-python/gnome-media-python-2.32.0-r1.ebuild b/dev-python/gnome-media-python/gnome-media-python-2.32.0-r1.ebuild deleted file mode 100644 index d4e660757ce3..000000000000 --- a/dev-python/gnome-media-python/gnome-media-python-2.32.0-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-media-python/gnome-media-python-2.32.0-r1.ebuild,v 1.1 2014/05/26 18:05:05 mgorny Exp $ - -EAPI="5" - -GNOME_ORG_MODULE="gnome-python-desktop" -G_PY_BINDINGS="mediaprofiles" -PYTHON_COMPAT=( python2_7 ) - -inherit gnome-python-common-r1 - -DESCRIPTION="Python bindings for GNOME media profiles" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="examples" - -RDEPEND="=gnome-extra/gnome-media-2.10.0:2 - >=gnome-base/gconf-2.10.0:2 - >=dev-python/gconf-python-2.25.90:2[${PYTHON_USEDEP}] - ! - - -gnome - diff --git a/dev-python/gns3-gui/Manifest b/dev-python/gns3-gui/Manifest new file mode 100644 index 000000000000..4a8c7ee4b467 --- /dev/null +++ b/dev-python/gns3-gui/Manifest @@ -0,0 +1 @@ +DIST gns3-gui-1.1.tar.gz 6654053 SHA256 c9457f666bf2bf5053155c80706ed2adf82df559b6f0e25439ca1e20d2c8eab0 SHA512 0bccc722cdac7719de2db6e89ce7cf01dc28db06156adf365c0ac009339e47fd4de8e9adde7f7fe9b71ab9a3fc6a60d1e4579507226e62693d6fa30f79f5457f WHIRLPOOL bcc66777d54fc3796ce8aed2b7e18cafdaee936946d9ba4345c427c448619779f97a613439b64572d19c841e127939f3432dfdb91dfcad7f60c9184df408c9f7 diff --git a/dev-python/gns3-gui/gns3-gui-1.1.ebuild b/dev-python/gns3-gui/gns3-gui-1.1.ebuild new file mode 100644 index 000000000000..af2b5bcc4553 --- /dev/null +++ b/dev-python/gns3-gui/gns3-gui-1.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/gns3-gui/gns3-gui-1.1.ebuild,v 1.3 2014/11/13 11:45:38 idella4 Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python{3_3,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="Graphical Network Simulator" +HOMEPAGE="http://www.gns3.net/" +SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +#block dev-python/PyQt4-4.11.3_pre20141024 as it breaks runtime +#net-misc/gns3-server version should always match gns3-gui version +#block net-misc/gns3 as it conflicts + +RDEPEND=">=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}] + >=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] + >=dev-python/requests-2.3.0[${PYTHON_USEDEP}] + >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}] + !=dev-python/PyQt4-4.11.3_pre20141024[${PYTHON_USEDEP}] + >=dev-python/PyQt4-4.11.2[X,svg,${PYTHON_USEDEP}] + dev-qt/qtgui:4 + dev-qt/qtsvg:4 + =net-misc/gns3-server-$PV + !!net-misc/gns3" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +python_prepare_all() { + # avoid file collisions caused by required tests + sed -e "s:find_packages():find_packages(exclude=['tests','tests.*']):" -i setup.py || die + distutils-r1_python_prepare_all +} + +python_install_all() { + distutils-r1_python_install_all + + doicon "${WORKDIR}/${P}/resources/images/gns3.ico" + make_desktop_entry "gns3" "GNS3" "/usr/share/pixmaps/gns3.ico" "Utility" +} diff --git a/dev-python/gns3-gui/metadata.xml b/dev-python/gns3-gui/metadata.xml new file mode 100644 index 000000000000..0ba10ecfb5b4 --- /dev/null +++ b/dev-python/gns3-gui/metadata.xml @@ -0,0 +1,12 @@ + + + + + idella4@gentoo.org + + + aaron@flappyport.com + Arron Bauman + proxy maintainer + + diff --git a/dev-python/libgda-python/Manifest b/dev-python/libgda-python/Manifest deleted file mode 100644 index 2fc6771cd4cb..000000000000 --- a/dev-python/libgda-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-python-extras-2.25.3.tar.bz2 370489 SHA256 ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467 WHIRLPOOL b0adfcef8bbb978d063a932393e17de9c8c519194f40085ecd03824ec4fb4421c84e0a4853a5a2d9fc40c94d8c0c261828447ac5fd69cff4ece39c52fc833590 diff --git a/dev-python/libgda-python/files/libgda-python-2.25.3-python-libs.patch b/dev-python/libgda-python/files/libgda-python-2.25.3-python-libs.patch deleted file mode 100644 index ab691272cbb6..000000000000 --- a/dev-python/libgda-python/files/libgda-python-2.25.3-python-libs.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7824fd5291f570de3c2c64185035d1a6a0a3445a Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 13 Aug 2012 04:42:47 -0400 -Subject: [PATCH] Replace horrible slow python libs search - ---- - acinclude.m4 | 36 ++---------------------------------- - 1 files changed, 2 insertions(+), 34 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 8694a65..f5373eb 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -59,40 +59,8 @@ $1],dnl - [AC_MSG_RESULT(not found) - $2]) - CPPFLAGS="$save_CPPFLAGS" -- -- # This bit is copied from Planner. murrayc. -- # Check for Python library path -- AC_MSG_CHECKING([for Python library path]) -- -- # Win32 has libpython25.a instead of libpython2.5.a, so we look -- # for both. TODO: Only look for libpython25.a on Windows, and for -- # libpython2.5.a on unix. -- WIN32_PYTHON_VERSION=`echo $PYTHON_VERSION | sed "s,\.,,"` -- -- python_path=`dirname $PYTHON | sed "s,/bin.*$,,"` -- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do -- if test -e "$i"; then -- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"` -- if test -n "$python_path" ; then -- python_lib="python$PYTHON_VERSION" -- break -- fi -- -- # Additionally test WIN32_PYTHON_VERSION -- python_path=`find $i -type f -name libpython$WIN32_PYTHON_VERSION.* -print | sed "1q"` -- if test -n "$python_path" ; then -- python_lib="python$WIN32_PYTHON_VERSION" -- break -- fi -- fi -- done -- -- python_path=`echo $python_path | sed "s,/libpython.*$,,"` -- AC_MSG_RESULT([$python_path]) -- if test -z "$python_path" ; then -- AC_MSG_ERROR([cannot find Python library path]) -- fi -- AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -l$python_lib"]) -+PYTHON_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; print('-L%s -lpython${PYTHON_VERSION}' % distutils.sysconfig.get_config_var('LIBDIR'))"` -+AC_SUBST([PYTHON_LDFLAGS],["$PYTHON_LDFLAGS"]) - ]) - - dnl --- -1.7.8.6 - diff --git a/dev-python/libgda-python/libgda-python-2.25.3-r1.ebuild b/dev-python/libgda-python/libgda-python-2.25.3-r1.ebuild deleted file mode 100644 index 6e82e0197ce8..000000000000 --- a/dev-python/libgda-python/libgda-python-2.25.3-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/libgda-python/libgda-python-2.25.3-r1.ebuild,v 1.1 2014/05/26 17:32:07 mgorny Exp $ - -EAPI="5" - -GNOME_ORG_MODULE="gnome-python-extras" -G_PY_BINDINGS="gda" -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils gnome-python-common-r1 - -DESCRIPTION="Python bindings for interacting with libgda" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -RDEPEND=">=gnome-extra/libgda-4:4 - >=dev-python/libbonobo-python-2.22.1:2[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - virtual/pkgconfig - gnome-base/gnome-common" -# eautoreconf needs gnome-base/gnome-common - -src_prepare() { - epatch "${FILESDIR}/${P}-python-libs.patch" #344231 - eautoreconf - gnome-python-common-r1_src_prepare -} diff --git a/dev-python/libgda-python/libgda-python-2.25.3.ebuild b/dev-python/libgda-python/libgda-python-2.25.3.ebuild deleted file mode 100644 index d56b6957214d..000000000000 --- a/dev-python/libgda-python/libgda-python-2.25.3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/libgda-python/libgda-python-2.25.3.ebuild,v 1.10 2012/08/13 09:31:09 tetromino Exp $ - -EAPI="2" -G_PY_PN="gnome-python-extras" -G_PY_BINDINGS="gda" - -SUPPORT_PYTHON_ABIS="1" -PYTHON_DEPEND="2" -RESTRICT_PYTHON_ABIS="3.*" - -inherit autotools eutils gnome-python-common - -PVP="$(get_version_component_range 1-2)" -SRC_URI="mirror://gnome/sources/${G_PY_PN}/${PVP}/${G_PY_PN}-${PV}.tar.bz2" - -DESCRIPTION="Python bindings for interacting with libgda" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" -IUSE="" - -RDEPEND=">=gnome-extra/libgda-4:4 - >=dev-python/libbonobo-python-2.22.1:2" -DEPEND="${RDEPEND} - virtual/pkgconfig - gnome-base/gnome-common" -# eautoreconf needs gnome-base/gnome-common - -src_prepare() { - epatch "${FILESDIR}/${P}-python-libs.patch" #344231 - eautoreconf - gnome-python-common_src_prepare -} diff --git a/dev-python/libgda-python/metadata.xml b/dev-python/libgda-python/metadata.xml deleted file mode 100644 index 9b1bc26a9df2..000000000000 --- a/dev-python/libgda-python/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - -gnome -python - diff --git a/dev-python/libgksu-python/Manifest b/dev-python/libgksu-python/Manifest deleted file mode 100644 index 2fc6771cd4cb..000000000000 --- a/dev-python/libgksu-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-python-extras-2.25.3.tar.bz2 370489 SHA256 ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467 WHIRLPOOL b0adfcef8bbb978d063a932393e17de9c8c519194f40085ecd03824ec4fb4421c84e0a4853a5a2d9fc40c94d8c0c261828447ac5fd69cff4ece39c52fc833590 diff --git a/dev-python/libgksu-python/files/libgksu-python-2.25.3-python-libs.patch b/dev-python/libgksu-python/files/libgksu-python-2.25.3-python-libs.patch deleted file mode 100644 index ab691272cbb6..000000000000 --- a/dev-python/libgksu-python/files/libgksu-python-2.25.3-python-libs.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7824fd5291f570de3c2c64185035d1a6a0a3445a Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 13 Aug 2012 04:42:47 -0400 -Subject: [PATCH] Replace horrible slow python libs search - ---- - acinclude.m4 | 36 ++---------------------------------- - 1 files changed, 2 insertions(+), 34 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 8694a65..f5373eb 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -59,40 +59,8 @@ $1],dnl - [AC_MSG_RESULT(not found) - $2]) - CPPFLAGS="$save_CPPFLAGS" -- -- # This bit is copied from Planner. murrayc. -- # Check for Python library path -- AC_MSG_CHECKING([for Python library path]) -- -- # Win32 has libpython25.a instead of libpython2.5.a, so we look -- # for both. TODO: Only look for libpython25.a on Windows, and for -- # libpython2.5.a on unix. -- WIN32_PYTHON_VERSION=`echo $PYTHON_VERSION | sed "s,\.,,"` -- -- python_path=`dirname $PYTHON | sed "s,/bin.*$,,"` -- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do -- if test -e "$i"; then -- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"` -- if test -n "$python_path" ; then -- python_lib="python$PYTHON_VERSION" -- break -- fi -- -- # Additionally test WIN32_PYTHON_VERSION -- python_path=`find $i -type f -name libpython$WIN32_PYTHON_VERSION.* -print | sed "1q"` -- if test -n "$python_path" ; then -- python_lib="python$WIN32_PYTHON_VERSION" -- break -- fi -- fi -- done -- -- python_path=`echo $python_path | sed "s,/libpython.*$,,"` -- AC_MSG_RESULT([$python_path]) -- if test -z "$python_path" ; then -- AC_MSG_ERROR([cannot find Python library path]) -- fi -- AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -l$python_lib"]) -+PYTHON_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; print('-L%s -lpython${PYTHON_VERSION}' % distutils.sysconfig.get_config_var('LIBDIR'))"` -+AC_SUBST([PYTHON_LDFLAGS],["$PYTHON_LDFLAGS"]) - ]) - - dnl --- -1.7.8.6 - diff --git a/dev-python/libgksu-python/libgksu-python-2.25.3-r1.ebuild b/dev-python/libgksu-python/libgksu-python-2.25.3-r1.ebuild deleted file mode 100644 index eb765989e1f9..000000000000 --- a/dev-python/libgksu-python/libgksu-python-2.25.3-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/libgksu-python/libgksu-python-2.25.3-r1.ebuild,v 1.1 2014/05/26 17:44:23 mgorny Exp $ - -EAPI="5" - -# The 'gksu' and 'gksuui' bindings are not supported. We don't have =libgksu-1* -# in tree. -GNOME_ORG_MODULE="gnome-python-extras" -G_PY_BINDINGS="gksu2" -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils gnome-python-common-r1 - -DESCRIPTION="Python bindings for libgksu" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="examples" - -RDEPEND=">=x11-libs/libgksu-2.0.4" -DEPEND="${RDEPEND} - virtual/pkgconfig - gnome-base/gnome-common" -# eautoreconf needs gnome-base/gnome-common - -EXAMPLES=( examples/gksu2/. ) - -src_prepare() { - epatch "${FILESDIR}/${P}-python-libs.patch" #344231 - eautoreconf - gnome-python-common-r1_src_prepare -} diff --git a/dev-python/libgksu-python/libgksu-python-2.25.3.ebuild b/dev-python/libgksu-python/libgksu-python-2.25.3.ebuild deleted file mode 100644 index a6afcab8d799..000000000000 --- a/dev-python/libgksu-python/libgksu-python-2.25.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/libgksu-python/libgksu-python-2.25.3.ebuild,v 1.9 2012/08/13 09:32:35 tetromino Exp $ - -EAPI="2" -# The 'gksu' and 'gksuui' bindings are not supported. We don't have =libgksu-1* -# in tree. -G_PY_PN="gnome-python-extras" -G_PY_BINDINGS="gksu2" - -SUPPORT_PYTHON_ABIS="1" -PYTHON_DEPEND="2" -RESTRICT_PYTHON_ABIS="3.*" - -inherit autotools eutils gnome-python-common - -PVP="$(get_version_component_range 1-2)" -SRC_URI="mirror://gnome/sources/${G_PY_PN}/${PVP}/${G_PY_PN}-${PV}.tar.bz2" - -DESCRIPTION="Python bindings for libgksu" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="examples" - -RDEPEND=">=x11-libs/libgksu-2.0.4" -DEPEND="${RDEPEND} - virtual/pkgconfig - gnome-base/gnome-common" -# eautoreconf needs gnome-base/gnome-common - -EXAMPLES="examples/gksu2/*" - -src_prepare() { - epatch "${FILESDIR}/${P}-python-libs.patch" #344231 - eautoreconf - gnome-python-common_src_prepare -} diff --git a/dev-python/libgksu-python/metadata.xml b/dev-python/libgksu-python/metadata.xml deleted file mode 100644 index 9b1bc26a9df2..000000000000 --- a/dev-python/libgksu-python/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - -gnome -python - diff --git a/dev-python/libgnomeprint-python/Manifest b/dev-python/libgnomeprint-python/Manifest deleted file mode 100644 index b3c5fb4b1ca1..000000000000 --- a/dev-python/libgnomeprint-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e diff --git a/dev-python/libgnomeprint-python/libgnomeprint-python-2.32.0-r1.ebuild b/dev-python/libgnomeprint-python/libgnomeprint-python-2.32.0-r1.ebuild deleted file mode 100644 index 94c5042e6de0..000000000000 --- a/dev-python/libgnomeprint-python/libgnomeprint-python-2.32.0-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/libgnomeprint-python/libgnomeprint-python-2.32.0-r1.ebuild,v 1.1 2014/05/26 17:41:38 mgorny Exp $ - -EAPI="5" - -GNOME_ORG_MODULE="gnome-python-desktop" -G_PY_BINDINGS=( gnomeprint gnomeprintui ) -PYTHON_COMPAT=( python2_7 ) - -inherit gnome-python-common-r1 - -DESCRIPTION="Python bindings for GNOME printing support" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="doc examples" - -RDEPEND=">=gnome-base/libgnomeprint-2.2.0:2.2 - >=gnome-base/libgnomeprintui-2.2.0:2.2 - >=dev-python/libgnomecanvas-python-2.25.90:2[${PYTHON_USEDEP}] - ! - - -gnome - diff --git a/dev-python/libgtop-python/Manifest b/dev-python/libgtop-python/Manifest deleted file mode 100644 index b3c5fb4b1ca1..000000000000 --- a/dev-python/libgtop-python/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-python-desktop-2.32.0.tar.bz2 621277 SHA256 09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18 WHIRLPOOL 5713353291a34e0a03152ad76c46391e3ab246efc17b63193fc0b26b02176eb78ce134c8d0cabcb3480bd2dbb3446b7b6b301cffbfac3ce915e21a974947e37e diff --git a/dev-python/libgtop-python/libgtop-python-2.32.0-r1.ebuild b/dev-python/libgtop-python/libgtop-python-2.32.0-r1.ebuild deleted file mode 100644 index a3f113d1f335..000000000000 --- a/dev-python/libgtop-python/libgtop-python-2.32.0-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/libgtop-python/libgtop-python-2.32.0-r1.ebuild,v 1.1 2014/05/26 17:41:30 mgorny Exp $ - -EAPI="5" - -GNOME_ORG_MODULE="gnome-python-desktop" -G_PY_BINDINGS="gtop" -PYTHON_COMPAT=( python2_7 ) - -inherit gnome-python-common-r1 - -DESCRIPTION="Python bindings for the libgtop library" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=gnome-base/libgtop-2.13.0:2 - ! - - -gnome - diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest index 000594a2bbc9..712a077d0862 100644 --- a/dev-python/nautilus-python/Manifest +++ b/dev-python/nautilus-python/Manifest @@ -1,2 +1 @@ -DIST nautilus-python-0.7.3.tar.bz2 253967 SHA256 d7971d71f1e91752c692d2ab4e99b7a71c042c6ede9f28a64a2f668fcb5cb3eb SHA512 0a53adb97355886de775108dcf5a22b3fe64d66b86ac363fecf3d22490b90fbd6519122aacc4cbaf0122a6c669b05d4ffd5ca0a6787225fd6f9d0dafcf4dad10 WHIRLPOOL f026c4f9623b838a5bcc3bada5d3af7a3fa52f9302cd6dcc0b92aaa7e7ac63573c1d8eee18e9bd3d918468a438e18d6a29928caa2a4e3bdaeeb2a34ed87a4bfe DIST nautilus-python-1.1.tar.xz 239392 SHA256 7825e08ada8e131f829d0e7d4144dcfac9fad7bfd7c0600bf3985349c20c496b SHA512 e721f46414a3efa4b5f5ec3f56cc00a308ec010a7a0612cef975d6f436494701f8bdbed39bdb5186c8013a582c7e63288a1c60adc4b8967c9ec69d6301a50fef WHIRLPOOL 280b6019a9850596b69777a758d89b06bfce5f30188feb274c8d5820ec6b9ecfcc8c0c402dbfee184378b2c02b6c29bc798ff061a139defd8cfae4e12b5d591d diff --git a/dev-python/nautilus-python/nautilus-python-0.7.3.ebuild b/dev-python/nautilus-python/nautilus-python-0.7.3.ebuild deleted file mode 100644 index 43ea88b3dda7..000000000000 --- a/dev-python/nautilus-python/nautilus-python-0.7.3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/nautilus-python/nautilus-python-0.7.3.ebuild,v 1.6 2012/01/21 15:51:34 klausman Exp $ - -EAPI="3" - -PYTHON_DEPEND="2" -GCONF_DEBUG="no" -inherit eutils gnome2 python autotools - -DESCRIPTION="Python bindings for the Nautilus file manager" -HOMEPAGE="http://projects.gnome.org/nautilus-python/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 x86" -IUSE="doc" - -DOCS="AUTHORS ChangeLog NEWS" -G2CONF="--docdir=${EPREFIX}/usr/share/doc/${PF}" - -RDEPEND=">=dev-python/pygtk-2.8 - >=dev-python/pygobject-2.16:2 - >=gnome-base/nautilus-2.22 - - - -gnome - diff --git a/dev-python/totem-python/totem-python-2.32.0-r1.ebuild b/dev-python/totem-python/totem-python-2.32.0-r1.ebuild deleted file mode 100644 index e744522f0529..000000000000 --- a/dev-python/totem-python/totem-python-2.32.0-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/totem-python/totem-python-2.32.0-r1.ebuild,v 1.1 2014/05/26 18:13:49 mgorny Exp $ - -EAPI="5" - -GNOME_ORG_MODULE="gnome-python-desktop" -G_PY_BINDINGS="totem_plparser" -PYTHON_COMPAT=( python2_7 ) - -inherit gnome-python-common-r1 - -DESCRIPTION="Python bindings for the Totem Playlist Parser" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND="dev-libs/totem-pl-parser - >=dev-python/gnome-vfs-python-2.25.90:2[${PYTHON_USEDEP}] - ! - - - dotnet - diff --git a/dev-util/mono-tools/mono-tools-2.10.ebuild b/dev-util/mono-tools/mono-tools-2.10.ebuild deleted file mode 100644 index 063d5e327203..000000000000 --- a/dev-util/mono-tools/mono-tools-2.10.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-2.10.ebuild,v 1.8 2014/01/19 21:21:02 moult Exp $ - -EAPI="4" - -inherit go-mono mono autotools - -DESCRIPTION="Set of useful Mono related utilities" -HOMEPAGE="http://www.mono-project.com/" - -LICENSE="GPL-2 MIT" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="+webkit gtkhtml" - -RDEPEND="=dev-lang/mono-${GO_MONO_REL_PV}* - >=dev-dotnet/gtk-sharp-2.12.6:2 - >=dev-dotnet/glade-sharp-2.12.6:2 - >=dev-dotnet/gconf-sharp-2:2 - gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0:2 ) - webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 ) - " -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/${PN}-2.8-html-renderer-fixes.patch" - "${FILESDIR}/${PN}-2.10-autoconf.patch" ) - -#Fails parallel make. -MAKEOPTS="${MAKEOPTS} -j1" - -pkg_setup() { - if ! use webkit && ! use gtkhtml - then - die "You must USE either webkit or gtkhtml" - fi -} - -src_prepare() { - go-mono_src_prepare - - # Stop getting ACLOCAL_FLAGS command not found problem like bug #298813 - sed -i -e '/ACLOCAL_FLAGS/d' Makefile.am || die - - eautoreconf -} - -src_configure() { - econf --disable-dependency-tracking \ - --disable-gecko \ - $(use_enable gtkhtml) \ - $(use_enable webkit) \ - --disable-monowebbrowser -} diff --git a/dev-vcs/bzr-gtk/Manifest b/dev-vcs/bzr-gtk/Manifest index aabc1e3c90b2..7d5a9568e584 100644 --- a/dev-vcs/bzr-gtk/Manifest +++ b/dev-vcs/bzr-gtk/Manifest @@ -1,3 +1,2 @@ -DIST bzr-gtk-0.100.0.tar.gz 220559 SHA256 7fb86183b9eaa07b0222b085465c18d61d9ecfa5e1c6d4456d8cbffe33d9ff85 SHA512 6cc82ac6ba943713822369a86fdf43873f8e9368e51a05fe8b5f40085d95fae9ac244874050604a5e178353f2ef87b2e45388d7b9693530b48ac8278f8097be8 WHIRLPOOL 9d6af2a5d8a719fa2d044f63a076d04f6c0ce7689813db6cadaaeb80716484811af8a394f62aa8015f49f3f1f59fe395bebcb06dde9a4bb379ed2130cb3d8b20 DIST bzr-gtk-0.103.0.tar.gz 210971 SHA256 5dc8b222d36f1a1d5d9a4c5048b9c5c2febb653e70a9a752dae941f58d34e2fe SHA512 b95496e514b2144ffc70f516360c4f59f885ad2105a8b989ac469313dada9d5ebf05fa5b11f4e6cb16f41f0b5380159ff974f867391387f702dd35ca6dd4fe27 WHIRLPOOL 7d9a2ea8d27ed25e6f2f3a83e0eed292b758dd25942c3f26b99cf2f267b9242c77d4be814dce6d86e226fc710752ff5e1664554fe5c151fd2da051eb69c6a21b DIST bzr-gtk-0.104.0.tar.gz 218863 SHA256 c6d378d5111ca3483de7c54ffd9f6c7264407f567c9556e76e802b9c55ff419b SHA512 d39a1303570dd7504cad9211f3b1c86d3e6f022535c262b7b5f7b19899b362ff7b01d9f19e557cb4391d7ccf1470635ebc5d5380d2d5216b6610c4e8e1b7b6a3 WHIRLPOOL 26f611122ba3a08cc281a9d8490ed53dedad5a64d13567518ea1697285fe6f1eaa331847f928b5ac91cb35e7deef0c7bef0f9f38eddb5f3abc8dec67a3f9772d diff --git a/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild b/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild deleted file mode 100644 index bd9d6d9bdd45..000000000000 --- a/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild,v 1.6 2012/09/30 18:38:37 armin76 Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils - -MY_P="/${P/_rc/rc}" - -DESCRIPTION="A GTK+ interfaces to most Bazaar operations" -HOMEPAGE="http://bazaar-vcs.org/bzr-gtk" -SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gconf gnome-keyring gpg +sourceview nautilus" - -DEPEND=">=dev-vcs/bzr-1.6_rc1 - dev-python/pygtk:2 - dev-python/notify-python - >=dev-python/pycairo-1.0" -RDEPEND="${DEPEND} - nautilus? ( =gnome-base/nautilus-3.0 ) - dev-python/notify-python - gnome-keyring? ( dev-python/gnome-keyring-python ) - gpg? ( app-crypt/seahorse ) - sourceview? ( - dev-python/pygtksourceview:2 - gconf? ( dev-python/gconf-python:2 ) - )" - -S="${WORKDIR}/${MY_P}" - -#TODO: src_test - -src_prepare() { - # Remove after release of > 0.99.0 - cp "${FILESDIR}"/credits.pickle "${S}"/credits.pickle -} - -src_install() { - distutils_src_install - insinto /etc/xdg/autostart - doins bzr-notify.desktop - if ! use nautilus - then - rm -rf "${D}"/usr/lib/nautilus/ - rm -rf "${D}"/usr/lib/python2.7/site-packages/bzrlib/plugins/gtk/nautilus-bzr.py - fi -} diff --git a/dev-vcs/bzr-gtk/metadata.xml b/dev-vcs/bzr-gtk/metadata.xml index 0ed18363654e..1394c148c83a 100644 --- a/dev-vcs/bzr-gtk/metadata.xml +++ b/dev-vcs/bzr-gtk/metadata.xml @@ -9,9 +9,7 @@ is also part of bzr-gtk. - Enable GConf support Support signing with GnuPG. - Enable GtkSourceView support Integrate with Nautilus file manager diff --git a/dev-vcs/giggle/Manifest b/dev-vcs/giggle/Manifest index a8fb92110e70..9ebfaf0745fd 100644 --- a/dev-vcs/giggle/Manifest +++ b/dev-vcs/giggle/Manifest @@ -1,2 +1 @@ -DIST giggle-0.6.2.tar.xz 1779744 SHA256 6d56c8a3b9ce12a87cd1aeb03f8cdabfc52a614d23a8db85878743b02426fee0 SHA512 e69bb477213475a7086719e0350947d18d7ce95ec68a88cfa83b6235f847304497046781c56304489a5e56ecb1b444e9c2642006157fd53a1c2252f5456334bf WHIRLPOOL 250c0d7308e725ed4e4b7457b1808abccd204978730289fa714eff7ba5917c5b0d5feb5e46a308996f2448a1582b6d73b68f8ac55332d84012e64b76efe27a0e DIST giggle-0.7.tar.xz 2042304 SHA256 ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59 SHA512 01d3cc0adc610706a97b89487624fe3d09c1347c0b07920e71d2e33761fab4894ebb304113ac7df6cdd03ed6116d09dcce85b35d6169df5a3f3973faaa151cfb WHIRLPOOL 54f721249b1e2bdaafcfd42c800ce4eb80e9b9e1ed312e853a2c30b650db25b98a14af2088849930a7be4ca36628c45021f276f04af13f7e76276a965cfc4c7b diff --git a/dev-vcs/giggle/files/giggle-0.6.1-gmodule-explicit.patch b/dev-vcs/giggle/files/giggle-0.6.1-gmodule-explicit.patch deleted file mode 100644 index 2716ea2cdeef..000000000000 --- a/dev-vcs/giggle/files/giggle-0.6.1-gmodule-explicit.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 6a4d71af9920df76a15e427671c90952fddbb411 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Thu, 19 Jan 2012 13:48:40 +0000 -Subject: build: Explicitly link to gmodule-2.0 - -gmodule-2.0 is now gone from the pkg-config files for GTK+ 3 and others. - -https://bugzilla.gnome.org/show_bug.cgi?id=667350 ---- -diff --git a/configure.ac b/configure.ac -index 07f5b7b..aa11046 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,6 +55,7 @@ GTKSOURCE_REQUIRED_VERSION=3.0 - PKG_CHECK_MODULES(GIGGLE, [ - gio-2.0 >= $GLIB_REQUIRED_VERSION - glib-2.0 >= $GLIB_REQUIRED_VERSION -+ gmodule-2.0 >= $GLIB_REQUIRED_VERSION - gthread-2.0 >= $GLIB_REQUIRED_VERSION - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION - gdk-3.0 >= $GTK_REQUIRED_VERSION --- -cgit v0.9.0.2 diff --git a/dev-vcs/giggle/giggle-0.6.2.ebuild b/dev-vcs/giggle/giggle-0.6.2.ebuild deleted file mode 100644 index a3a6306f92b3..000000000000 --- a/dev-vcs/giggle/giggle-0.6.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.6.2.ebuild,v 1.4 2013/04/13 12:42:01 ikelos Exp $ - -EAPI="5" - -inherit gnome2 eutils - -DESCRIPTION="GTK+ Frontend for GIT" -HOMEPAGE="http://live.gnome.org/giggle" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-interix ~amd64-linux ~x86-linux" -IUSE="eds" - -RDEPEND=">=dev-vcs/git-1.5 - >=dev-libs/glib-2.18:2 - >=x11-libs/gtk+-3.0:3 - >=x11-libs/gtksourceview-3.0:3.0 - >=x11-libs/gdk-pixbuf-2.22.0 - gnome-base/gnome-common - eds? ( =x11-libs/vte-0.26:2.90" -DEPEND="${RDEPEND} - sys-devel/gettext - app-text/yelp-tools - virtual/pkgconfig - >=dev-util/intltool-0.35 - >=sys-devel/autoconf-2.64 - >=sys-devel/libtool-2" - -DOCS="AUTHORS ChangeLog NEWS README" - -G2CONF="$(use_enable eds evolution-data-server)" - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.6.2-gtksourceview-3.8.0.patch" -} diff --git a/dev-vcs/giggle/giggle-0.7.ebuild b/dev-vcs/giggle/giggle-0.7.ebuild deleted file mode 100644 index 6962cf241ca7..000000000000 --- a/dev-vcs/giggle/giggle-0.7.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/giggle/giggle-0.7.ebuild,v 1.1 2013/10/12 14:35:35 ikelos Exp $ - -EAPI="5" - -inherit gnome2 eutils - -DESCRIPTION="GTK+ Frontend for GIT" -HOMEPAGE="http://live.gnome.org/giggle" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux" -IUSE="eds" - -RDEPEND=">=dev-vcs/git-1.5 - >=dev-libs/glib-2.30:2 - >=x11-libs/gtk+-3.3.12:3 - >=x11-libs/gtksourceview-3.0:3.0 - >=x11-libs/gdk-pixbuf-2.22.0 - gnome-base/gnome-common - eds? ( =x11-libs/vte-0.28:2.90" -DEPEND="${RDEPEND} - sys-devel/gettext - app-text/yelp-tools - virtual/pkgconfig - >=dev-util/intltool-0.35 - >=sys-devel/autoconf-2.64 - >=sys-devel/libtool-2" - -DOCS="AUTHORS ChangeLog NEWS README" - -G2CONF="$(use_enable eds evolution-data-server)" - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.6.2-gtksourceview-3.8.0.patch" -} diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest index 340fb8dbe116..a6d6b61aba56 100644 --- a/gnome-base/gconf/Manifest +++ b/gnome-base/gconf/Manifest @@ -1,2 +1 @@ -DIST GConf-2.32.4.tar.xz 1326600 SHA256 f36f4a01a5ac898b5ec49a04a43b051d3809f07c3d0841188fd6a5c512389025 SHA512 fabcd35ae9dd50969dc60219172e613fdb9f81ecaf182003a7e9d81745ffa9931fc279383dae9d6eb25817f594ab38e1ec2e910e14df402a1cb515eae258358f WHIRLPOOL 836491977e5af62a02fa8e70c92f2c2a07c350aabd44b75b0e9ab203c36d0fd53ed7605e26c81a01e498c8bb7d5e3089427ede8d7583964b65aecc46ddac7faf DIST GConf-3.2.6.tar.xz 1559904 SHA256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58 WHIRLPOOL ef38b5fb25b3cf915052ce00f926a0a9bf8ecb5771c2db0fd6f5f11531a8edb1c098a036eaaa20490e3de87a0a5eb411542f86d8c6a2be8ac45dcae0b29d3414 diff --git a/gnome-base/gconf/gconf-2.32.4-r1.ebuild b/gnome-base/gconf/gconf-2.32.4-r1.ebuild deleted file mode 100644 index bafb8194467c..000000000000 --- a/gnome-base/gconf/gconf-2.32.4-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4-r1.ebuild,v 1.1 2013/05/10 10:36:24 eva Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME_ORG_MODULE="GConf" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 - -DESCRIPTION="GNOME configuration system and daemon" -HOMEPAGE="http://projects.gnome.org/gconf/" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="debug gtk +introspection ldap policykit" - -RDEPEND=" - >=dev-libs/glib-2.25.9:2 - >=x11-libs/gtk+-2.14:2 - >=dev-libs/dbus-glib-0.74:= - >=sys-apps/dbus-1:= - >=gnome-base/orbit-2.4:2 - >=dev-libs/libxml2-2:2 - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) - ldap? ( net-nds/openldap:= ) - policykit? ( sys-auth/polkit:= ) -" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - >=dev-util/intltool-0.35 - virtual/pkgconfig -" - -pkg_setup() { - kill_gconf -} - -src_prepare() { - # Do not start gconfd when installing schemas, fix bug #238276, upstream #631983 - epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch" - - # Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985 - epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch" - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --enable-gsettings-backend \ - $(use_enable gtk) \ - $(usex gtk --with-gtk=2.0 "") \ - $(use_enable introspection) \ - $(use_with ldap openldap) \ - $(use_enable policykit defaults-service) \ - ORBIT_IDL=$(type -P orbit-idl-2) -} - -src_install() { - gnome2_src_install - - keepdir /etc/gconf/gconf.xml.mandatory - keepdir /etc/gconf/gconf.xml.defaults - # Make sure this directory exists, bug #268070, upstream #572027 - keepdir /etc/gconf/gconf.xml.system - - echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf - echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf - doenvd 50gconf - dodir /root/.gconfd -} - -pkg_preinst() { - kill_gconf -} - -pkg_postinst() { - kill_gconf - - # change the permissions to avoid some gconf bugs - einfo "changing permissions for gconf dirs" - find "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \; - - einfo "changing permissions for gconf files" - find "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \; -} - -kill_gconf() { - # This function will kill all running gconfd-2 that could be causing troubles - if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ] - then - "${EPREFIX}"/usr/bin/gconftool-2 --shutdown - fi - - return 0 -} diff --git a/gnome-base/gconf/gconf-3.2.6-r1.ebuild b/gnome-base/gconf/gconf-3.2.6-r1.ebuild deleted file mode 100644 index caf517fa2295..000000000000 --- a/gnome-base/gconf/gconf-3.2.6-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r1.ebuild,v 1.7 2014/02/22 21:37:23 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME_ORG_MODULE="GConf" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_{6,7} ) -PYTHON_REQ_USE="xml" - -inherit eutils gnome2 python-r1 - -DESCRIPTION="GNOME configuration system and daemon" -HOMEPAGE="http://projects.gnome.org/gconf/" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="debug gtk +introspection ldap orbit policykit" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.31:2 - >=dev-libs/dbus-glib-0.74:= - >=sys-apps/dbus-1:= - >=dev-libs/libxml2-2:2 - gtk? ( >=x11-libs/gtk+-2.90:3 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) - ldap? ( net-nds/openldap:= ) - orbit? ( >=gnome-base/orbit-2.4:2 ) - policykit? ( sys-auth/polkit:= ) -" -DEPEND="${RDEPEND} - dev-libs/libxslt - dev-util/gtk-doc-am - >=dev-util/intltool-0.35 - virtual/pkgconfig -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -pkg_setup() { - kill_gconf -} - -src_prepare() { - # Do not start gconfd when installing schemas, fix bug #238276, upstream #631983 - epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch" - - # Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985 - epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch" - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --enable-gsettings-backend \ - $(use_enable gtk) \ - $(usex gtk --with-gtk=3.0 "") \ - $(use_enable introspection) \ - $(use_with ldap openldap) \ - $(use_enable orbit) \ - $(use_enable policykit defaults-service) \ - ORBIT_IDL=$(type -P orbit-idl-2) -} - -src_install() { - gnome2_src_install - python_replicate_script "${ED}"/usr/bin/gsettings-schema-convert || die - - keepdir /etc/gconf/gconf.xml.mandatory - keepdir /etc/gconf/gconf.xml.defaults - # Make sure this directory exists, bug #268070, upstream #572027 - keepdir /etc/gconf/gconf.xml.system - - echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf - echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf - doenvd 50gconf - dodir /root/.gconfd -} - -pkg_preinst() { - kill_gconf -} - -pkg_postinst() { - kill_gconf - - # change the permissions to avoid some gconf bugs - einfo "changing permissions for gconf dirs" - find "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \; - - einfo "changing permissions for gconf files" - find "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \; - - if ! use orbit; then - ewarn "You are using dbus for GConf's IPC. If you are upgrading from" - ewarn "<=gconf-3.2.3, or were previously using gconf with USE=orbit," - ewarn "you will need to now restart your desktop session (for example," - ewarn "by logging out and then back in)." - ewarn "Otherwise, gconf-based applications may crash with 'Method ..." - ewarn "on interface \"org.gnome.GConf.Server\" doesn't exist' errors." - fi -} - -kill_gconf() { - # This function will kill all running gconfd-2 that could be causing troubles - if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ] - then - "${EPREFIX}"/usr/bin/gconftool-2 --shutdown - fi - - return 0 -} diff --git a/gnome-base/gconf/gconf-3.2.6-r2.ebuild b/gnome-base/gconf/gconf-3.2.6-r2.ebuild deleted file mode 100644 index 25ed45e670d7..000000000000 --- a/gnome-base/gconf/gconf-3.2.6-r2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.6-r2.ebuild,v 1.9 2014/06/20 14:45:02 ago Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME_ORG_MODULE="GConf" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_{6,7} ) -PYTHON_REQ_USE="xml" - -inherit eutils gnome2 python-r1 - -DESCRIPTION="GNOME configuration system and daemon" -HOMEPAGE="http://projects.gnome.org/gconf/" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="debug +introspection ldap policykit" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.31:2 - >=dev-libs/dbus-glib-0.74:= - >=sys-apps/dbus-1:= - >=dev-libs/libxml2-2:2 - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) - ldap? ( net-nds/openldap:= ) - policykit? ( sys-auth/polkit:= ) -" -DEPEND="${RDEPEND} - dev-libs/libxslt - dev-util/gtk-doc-am - >=dev-util/intltool-0.35 - virtual/pkgconfig -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -pkg_setup() { - kill_gconf -} - -src_prepare() { - # Do not start gconfd when installing schemas, fix bug #238276, upstream #631983 - epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch" - - # Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985 - epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch" - - # From 'master' - # mconvert: enable recursive scheme lookup and fix a crasher - epatch "${FILESDIR}/${P}-mconvert-crasher.patch" - - # dbus: Don't spew to console when unable to connect to dbus daemon - epatch "${FILESDIR}/${P}-spew-console-error.patch" - - # gsettings-data-convert: Warn (and fix) invalid schema paths - epatch "${FILESDIR}/${P}-gsettings-data-convert-paths.patch" - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - --enable-gsettings-backend \ - --with-gtk=3.0 \ - --disable-orbit \ - $(use_enable introspection) \ - $(use_with ldap openldap) \ - $(use_enable policykit defaults-service) -} - -src_install() { - gnome2_src_install - python_replicate_script "${ED}"/usr/bin/gsettings-schema-convert || die - - keepdir /etc/gconf/gconf.xml.mandatory - keepdir /etc/gconf/gconf.xml.defaults - # Make sure this directory exists, bug #268070, upstream #572027 - keepdir /etc/gconf/gconf.xml.system - - echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf - echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf - doenvd 50gconf - dodir /root/.gconfd -} - -pkg_preinst() { - kill_gconf -} - -pkg_postinst() { - kill_gconf - - # change the permissions to avoid some gconf bugs - einfo "changing permissions for gconf dirs" - find "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \; - - einfo "changing permissions for gconf files" - find "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \; -} - -kill_gconf() { - # This function will kill all running gconfd-2 that could be causing troubles - if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ] - then - "${EPREFIX}"/usr/bin/gconftool-2 --shutdown - fi - - return 0 -} diff --git a/gnome-base/gconf/metadata.xml b/gnome-base/gconf/metadata.xml index 07f0b7f4661a..40c5d90d727f 100644 --- a/gnome-base/gconf/metadata.xml +++ b/gnome-base/gconf/metadata.xml @@ -6,7 +6,5 @@ Build backend which enables default mail accounts, addressbooks and calendars for Evolution to be configured using each user's LDAP entry." - Use gnome-base/orbit for IPC, same as in - gconf-2.x diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index c7bdfe73ee99..77c31073e1a2 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,5 +1,2 @@ -DIST gdm-2.20.11.tar.bz2 4013059 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad1a28ef05f7e0178891f1eaa2 SHA512 ca8ce81161c640ef2753a35b8eb0fd8669a7e42dc6272b2aa7b4a9f525b4d03dc46bb5aa8d41b69aaba36c8715a220c92e75c169ce9d5af39b25853505abeb39 WHIRLPOOL 0bdb90aef849c7b505ffb1b0af1b904970a9cd11c27cf631794b14a01b5e0fb01666a51b68cf288ae79057dd7bfca9a8f1ef9518ec5b04a4867eb7792c631765 -DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 SHA512 aaf0f4bfdb13f6dc81dbfe93b144343b6a8146698450fce9753396c92bef2c4e699f3f5c2ff9b88736432d2fcb861ab8dc423148109cb9194983e0c07baa8aa5 WHIRLPOOL 698cd66740872260a106f8174a51a44a45817112d696b2741fd537a10362308ffa8917df31190fe042c46b7ea76e2f8d1147f5c15e39cfb33f1f2f7e951ffb78 DIST gdm-3.12.2.tar.xz 1522384 SHA256 cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4 SHA512 0c7f93fa12f1b2c4b6af71ea2767dc2b3367cc0330edfa106b1fe6c1ed6f112cc148f2319801bc44bc9ff6636d0b8cf5bd4be67999b48f1a7275c68ce9d5dbab WHIRLPOOL 3fd6ca8f53316a0cc167741b35a9ac402d00da12feae162c567e62d4b72cf63ef6f695725f7bc8a755c7c567daf0de0661bf8d96e22472da22fd6ba110880ed7 -DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153 diff --git a/gnome-base/gdm/files/49-keychain b/gnome-base/gdm/files/49-keychain deleted file mode 100644 index 77310b2a7461..000000000000 --- a/gnome-base/gdm/files/49-keychain +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# source keychain variables - -keychain="`which keychain`" -if [ -n "$keychain" ] && [ -x "$keychain" ] && [ -f "$HOME/.bash_profile" ] -then - . "${HOME}/.bash_profile" -fi diff --git a/gnome-base/gdm/files/50-ssh-agent b/gnome-base/gdm/files/50-ssh-agent deleted file mode 100644 index 28af2672c794..000000000000 --- a/gnome-base/gdm/files/50-ssh-agent +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# add ssh-agent if found - -sshagent="`which ssh-agent`" -if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then - command="$sshagent -- $command" -elif [ -z "$sshagent" ] ; then - echo "$0: ssh-agent not found!" -fi diff --git a/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch b/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch deleted file mode 100644 index 7af2f9a18ffc..000000000000 --- a/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure gdm-2.13.0.1/configure ---- gdm-2.13.0.1.orig/configure 2005-11-14 17:34:33.000000000 -0500 -+++ gdm-2.13.0.1/configure 2005-11-18 14:59:31.000000000 -0500 -@@ -31700,7 +31700,7 @@ - #define HAVE_SELINUX 1 - _ACEOF - -- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" -+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" - fi - - # -diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure.ac gdm-2.13.0.1/configure.ac ---- gdm-2.13.0.1.orig/configure.ac 2005-11-14 17:13:40.000000000 -0500 -+++ gdm-2.13.0.1/configure.ac 2005-11-18 14:59:23.000000000 -0500 -@@ -750,7 +750,7 @@ - AC_CHECK_LIB(selinux,setexeccon,/bin/true) - AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true) - AC_DEFINE(HAVE_SELINUX) -- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" -+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" - fi - - # diff --git a/gnome-base/gdm/files/gdm-2.20.10-custom-session.patch b/gnome-base/gdm/files/gdm-2.20.10-custom-session.patch deleted file mode 100644 index b1f70c00cb54..000000000000 --- a/gnome-base/gdm/files/gdm-2.20.10-custom-session.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- - fix custom sessions (see bug #216984, work done by Gilles, I'm just committing) - - config/Xsession.in | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -Index: b/config/Xsession.in -=================================================================== ---- a/config/Xsession.in -+++ b/config/Xsession.in -@@ -177,15 +177,6 @@ if [ -n "$GDM_LANG" ]; then - fi - fi - --# run all system xinitrc shell scripts. --if [ -d /etc/X11/xinit/xinitrc.d ]; then -- for i in /etc/X11/xinit/xinitrc.d/* ; do -- if [ -x "$i" ]; then -- . "$i" -- fi -- done --fi -- - if [ "x$command" = "xcustom" ] ; then - if [ -x "$HOME/.xsession" ]; then - command="$HOME/.xsession" -@@ -213,6 +204,15 @@ if [ "x$command" = "xdefault" ] ; then - fi - fi - -+# run all system xinitrc shell scripts. -+if [ -d /etc/X11/xinit/xinitrc.d ]; then -+ for i in /etc/X11/xinit/xinitrc.d/* ; do -+ if [ -x "$i" ]; then -+ . "$i" -+ fi -+ done -+fi -+ - # add ssh-agent if found - sshagent="`gdmwhich ssh-agent`" - if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then diff --git a/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch b/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch deleted file mode 100644 index 1c7b674382f5..000000000000 --- a/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch +++ /dev/null @@ -1,34 +0,0 @@ -Author: Fabio Erculiani -Date: Fri, 08 Aug 2009 09:19 +0000 -Subject: Fix DESTOP_SESSION when dmrc is empty and autologin enabled. - ---- - daemon/slave.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/daemon/slave.c b/daemon/slave.c -index b52774d..ced9567 100644 ---- a/daemon/slave.c -+++ b/daemon/slave.c -@@ -4638,10 +4638,6 @@ gdm_slave_session_start (void) - language = g_strdup (usrlang); - } - -- tmp = gdm_strip_extension (session, ".desktop"); -- g_free (session); -- session = tmp; -- - if (ve_string_empty (session)) { - g_free (session); - session = find_a_session (); -@@ -4651,6 +4647,10 @@ gdm_slave_session_start (void) - } - } - -+ tmp = gdm_strip_extension (session, ".desktop"); -+ g_free (session); -+ session = tmp; -+ - if G_LIKELY (ve_string_empty (language)) { - g_free (language); - language = NULL; diff --git a/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch b/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch deleted file mode 100644 index 327d8e6fec90..000000000000 --- a/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch +++ /dev/null @@ -1,22 +0,0 @@ -# -# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gdm/+bug/256283 -# Description: Fix 24 hour combo box in gdmsetup -# -Index: gdm-2.20.10/gui/gdmsetup.c -=================================================================== ---- gdm-2.20.10.orig/gui/gdmsetup.c 2009-04-03 14:17:35.000000000 +1100 -+++ gdm-2.20.10/gui/gdmsetup.c 2009-04-03 14:17:45.000000000 +1100 -@@ -1529,11 +1529,11 @@ - val = gdm_config_get_string ((gchar *)key); - - if (new_val) { -- if (strcmp (_(new_val), _("auto"))) { -+ if (strcmp (_(new_val), _("auto")) == 0) { - if (strcasecmp (ve_sure_string (val), "auto") != 0) - gdm_setup_config_set_string (key, "auto"); - } -- else if (strcmp (_(new_val), _("yes"))) { -+ else if (strcmp (_(new_val), _("yes")) == 0) { - if (strcasecmp (ve_sure_string (val), "true") != 0 && - strcasecmp (ve_sure_string (val), "yes") != 0) - gdm_setup_config_set_string (key, "true"); diff --git a/gnome-base/gdm/files/gdm-2.20.10-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.20.10-xinitrc-ssh-agent.patch deleted file mode 100644 index 8d20d1c1c671..000000000000 --- a/gnome-base/gdm/files/gdm-2.20.10-xinitrc-ssh-agent.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- - ssh-agent really needs to be handled by xinitrc like other agents. - Gentoo bug: 220603 - - config/Xsession.in | 8 -------- - 1 file changed, 8 deletions(-) - -Index: b/config/Xsession.in -=================================================================== ---- a/config/Xsession.in -+++ b/config/Xsession.in -@@ -213,14 +213,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then - done - fi - --# add ssh-agent if found --sshagent="`gdmwhich ssh-agent`" --if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then -- command="$sshagent -- $command" --elif [ -z "$sshagent" ] ; then -- echo "$0: ssh-agent not found!" --fi -- - echo "$0: Setup done, will execute: $command" - - eval exec $command diff --git a/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch b/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch deleted file mode 100644 index f7accccf3a46..000000000000 --- a/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch +++ /dev/null @@ -1,59 +0,0 @@ -See https://bugs.gentoo.org/show_bug.cgi?id=496914 - -diff --git a/configure.ac b/configure.ac -index 3da7f33..8a0eedf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -160,6 +160,9 @@ AC_CHECK_TYPE(socklen_t,, - - AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv getutxent updwtmpx logwtmp login logout]) - -+AC_CHECK_LIBM -+AC_SUBST(LIBM) -+ - dnl checks needed for Darwin compatibility to linux **environ. - AC_CHECK_HEADERS(crt_externs.h) - AC_CHECK_FUNCS(_NSGetEnviron) -diff --git a/gui/Makefile.am b/gui/Makefile.am -index 577dc9f..3334381 100644 ---- a/gui/Makefile.am -+++ b/gui/Makefile.am -@@ -123,6 +123,7 @@ gdmchooser_LDADD = \ - $(XINERAMA_LIBS) \ - $(X_LIBS) \ - $(XDMCP_LIBS) \ -+ -lXau \ - -lX11 \ - -lfontconfig \ - $(NULL) -@@ -143,8 +144,10 @@ gdmlogin_LDADD = \ - $(X_EXTRA_LIBS) \ - $(XINERAMA_LIBS) \ - $(X_LIBS) \ -+ -lXau \ - -lX11 \ - -lfontconfig \ -+ $(LIBM) \ - $(NULL) - - # LIBGNOMEUI should be removed from gdmsetup at some point. -@@ -183,6 +186,7 @@ gdmphotosetup_LDADD = \ - $(INTLLIBS) \ - $(EXTRA_SOCKET_LIB) \ - $(EXTRA_NSL_LIB) \ -+ -lXau \ - -lX11 \ - -lfontconfig \ - $(top_builddir)/common/libgdmcommon.a \ -diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am -index fd0f500..7b9840d 100644 ---- a/gui/greeter/Makefile.am -+++ b/gui/greeter/Makefile.am -@@ -91,6 +91,7 @@ gdmgreeter_LDADD = \ - $(X_EXTRA_LIBS) \ - $(XINERAMA_LIBS) \ - $(X_LIBS) \ -+ -lXau \ - -lX11 \ - -lfontconfig - diff --git a/gnome-base/gdm/files/gdm-2.20.2-gksu.patch b/gnome-base/gdm/files/gdm-2.20.2-gksu.patch deleted file mode 100644 index 388917708047..000000000000 --- a/gnome-base/gdm/files/gdm-2.20.2-gksu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gdm-2.20.2.orig/gui/gdmsetup.desktop.in.in gdm-2.20.2/gui/gdmsetup.desktop.in.in ---- gdm-2.20.2.orig/gui/gdmsetup.desktop.in.in 2007-11-26 18:11:04.000000000 -0500 -+++ gdm-2.20.2/gui/gdmsetup.desktop.in.in 2007-11-29 11:40:38.000000000 -0500 -@@ -3,7 +3,7 @@ Encoding=UTF-8 - _Name=Login Window - _Comment=Configure GDM login window appearance and behavior - TryExec=@sbindir@/gdmsetup --Exec=@sbindir@/gdmsetup -+Exec=gksu @sbindir@/gdmsetup - Icon=gdmsetup - StartupNotify=true - Terminal=false diff --git a/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch b/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch deleted file mode 100644 index 3327e967d51f..000000000000 --- a/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/gui/Makefile.am 2009-01-04 16:51:19.000000000 +0100 -+++ b/gui/Makefile.am 2009-01-04 16:52:10.000000000 +0100 -@@ -263,7 +263,7 @@ - Gladedir = $(datadir)/gdm - Glade_DATA = gdmsetup.glade gdmchooser.glade gdmphotosetup.glade - --install-data-local: -+install-data-hook: - -test -z "$(DESTDIR)$(bindir)/gdmXnest" || rm -f $(DESTDIR)$(bindir)/gdmXnest - $(LN_S) -f gdmXnestchooser $(DESTDIR)$(bindir)/gdmXnest - ---- a/gui/Makefile.in 2009-01-04 16:51:39.000000000 +0100 -+++ b/gui/Makefile.in 2009-01-04 16:52:52.000000000 +0100 -@@ -1222,7 +1225,9 @@ - info-am: - - install-data-am: install-GladeDATA install-SettingsDATA \ -- install-SystemDATA install-data-local -+ install-SystemDATA -+ @$(NORMAL_INSTALL) -+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook - - install-dvi: install-dvi-recursive - -@@ -1275,7 +1280,7 @@ - html-am info info-am install install-GladeDATA \ - install-SettingsDATA install-SystemDATA install-am \ - install-binPROGRAMS install-data install-data-am \ -- install-data-local install-dvi install-dvi-am install-exec \ -+ install-data-hook install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libexecPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ -@@ -1295,7 +1300,7 @@ - - @INTLTOOL_DESKTOP_RULE@ - --install-data-local: -+install-data-hook: - -test -z "$(DESTDIR)$(bindir)/gdmXnest" || rm -f $(DESTDIR)$(bindir)/gdmXnest - $(LN_S) -f gdmXnestchooser $(DESTDIR)$(bindir)/gdmXnest - diff --git a/gnome-base/gdm/gdm-2.20.11-r1.ebuild b/gnome-base/gdm/gdm-2.20.11-r1.ebuild deleted file mode 100644 index 4e8bb36ef129..000000000000 --- a/gnome-base/gdm/gdm-2.20.11-r1.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild,v 1.12 2014/01/03 20:13:17 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools eutils pam gnome2 user - -DESCRIPTION="GNOME Display Manager" -HOMEPAGE="https://live.gnome.org/GDM" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" - -IUSE_LIBC="elibc_glibc" -IUSE="accessibility afs branding +consolekit dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC" - -# Name of the tarball with gentoo specific files -GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1" - -SRC_URI="${SRC_URI} - mirror://gentoo/${GDM_EXTRA}.tar.bz2 - branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )" - -RDEPEND=">=dev-libs/glib-2.12:2 - >=x11-libs/gtk+-2.6:2 - >=x11-libs/pango-1.3 - >=gnome-base/libglade-2:2.0 - >=gnome-base/libgnomecanvas-2 - >=gnome-base/librsvg-1.1.1:2 - >=dev-libs/libxml2-2.4.12:2 - >=media-libs/libart_lgpl-2.3.11 - x11-libs/gksu - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXext - x11-apps/sessreg - x11-libs/libXdmcp - xinerama? ( x11-libs/libXinerama ) - consolekit? ( - sys-auth/consolekit - dev-libs/dbus-glib ) - accessibility? ( x11-libs/libXevie ) - afs? ( net-fs/openafs sys-libs/lwp ) - dmx? ( x11-libs/libdmx ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) - pam? ( virtual/pam ) - !pam? ( elibc_glibc? ( sys-apps/shadow ) ) - remote? ( gnome-extra/zenity ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - >=x11-misc/xdg-utils-1.0.2-r3" -DEPEND="${RDEPEND} - dmx? ( x11-proto/dmxproto ) - xinerama? ( x11-proto/xineramaproto ) - app-text/docbook-xml-dtd:4.1.2 - sys-devel/gettext - x11-proto/inputproto - >=dev-util/intltool-0.35 - virtual/pkgconfig - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - G2CONF="${G2CONF} - --with-prefetch - --sysconfdir=/etc/X11 - --localstatedir=/var - --with-xdmcp=yes - --with-pam-prefix=/etc - --disable-static - SOUND_PROGRAM=/usr/bin/gdmplay - $(use_enable ipv6) - $(use_enable remote secureremote) - $(use_with accessibility xevie) - $(use_with consolekit console-kit) - $(use_with dmx) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_with xinerama)" - - if use pam; then - G2CONF="${G2CONF} --enable-authentication-scheme=pam" - else - G2CONF="${G2CONF} --enable-console-helper=no" - if use elibc_glibc ; then - G2CONF="${G2CONF} --enable-authentication-scheme=shadow" - else - G2CONF="${G2CONF} --enable-authentication-scheme=crypt" - fi - fi - - enewgroup gdm - enewuser gdm -1 -1 /var/lib/gdm gdm -} - -src_prepare() { - # remove unneeded linker directive for selinux (#41022) - epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch" - - # Add gksu to gdmsetup menu entry - epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch" - - # Fix parallel install, bug #217037 - epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch" - - # Make custom session work, bug #216984 - epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch" - - # ssh-agent handling must be done at xinitrc.d, bug #220603 - epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch" - - # Fix wrong DESKTOP_SESSION set if ${HOME}/.dmrc is not found or - # does not contain any relevant data and autologin enabled, bug #281442 - epatch "${FILESDIR}/${PN}-2.20.10-desktop-session-dmrc-autologin.patch" - - # Fix 24 hour combo box in gdmsetup, bug #301151 - # patch imported from ubuntu mirrors - epatch "${FILESDIR}/${PN}-2.20.10-gdmsetup-24hr-combo.patch" - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ - || die "sed failed" - - # Underlinking for libXau, libm; bug #496914 - epatch "${FILESDIR}/${P}-underlinking.patch" - rm missing || die # old version in tarball - eautoreconf - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - - local gentoodir="${WORKDIR}/${GDM_EXTRA}" - - # gdm-binary should be gdm to work with our init (#5598) - rm -f "${D}/usr/sbin/gdm" - dosym /usr/sbin/gdm-binary /usr/sbin/gdm - - # our x11's scripts point to /usr/bin/gdm - dosym /usr/sbin/gdm-binary /usr/bin/gdm - - # log, etc. - keepdir /var/log/gdm - keepdir /var/gdm - - fowners root:gdm /var/gdm - fperms 1770 /var/gdm - - # add a custom xsession .desktop by default (#44537) - exeinto /etc/X11/dm/Sessions - doexe "${gentoodir}/custom.desktop" - - # add xinitrc.d scripts - exeinto /etc/X11/xinit/xinitrc.d - doexe "${FILESDIR}/49-keychain" - doexe "${FILESDIR}/50-ssh-agent" - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm - - # add a custom sound playing script (#248253) - dobin "${gentoodir}/gdmplay" - - # avoid file collision, bug #213118 - rm -f "${D}/usr/share/xsessions/gnome.desktop" - - # We replace the pam stuff by our own - rm -rf "${D}/etc/pam.d" - - if use pam ; then - use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* - - dopamd "${gentoodir}"/pam.d/* - dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup" - fi - - # use graphical greeter local - sed -i -e "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \ - "${D}"/usr/share/gdm/defaults.conf || die - - # list available users - sed -i -e "s:^#MinimalUID=.*:MinimalUID=1000:" "${D}"/usr/share/gdm/defaults.conf || die - sed -i -e "s:^#IncludeAll=.*:IncludeAll=true:" "${D}"/usr/share/gdm/defaults.conf || die - - # Fix old X11R6 paths - sed -i -e "s:/usr/X11R6/bin:/usr/bin:" "${D}"/usr/share/gdm/defaults.conf || die - - # Use Clearlooks as default theme, bug #268496 - sed -i -e "s:#GtkTheme=Default:GtkTheme=Clearlooks:" "${D}"/usr/share/gdm/defaults.conf || die - - # Wait more before assuming Xserver is defunct, bug #378765 - sed -i -e "s:GdmXserverTimeout=10:GdmXserverTimeout=25:" "${D}"/usr/share/gdm/defaults.conf || die - - # Move Gentoo theme in - if use branding ; then - mv "${WORKDIR}"/gentoo-* "${D}/usr/share/gdm/themes" - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - elog "To make GDM start at boot, edit /etc/conf.d/xdm" - elog "and then execute 'rc-update add xdm default'." - - elog "GDM has changed the location of its configuration file. Please" - elog "edit /etc/X11/gdm/custom.conf. The factory defaults are located" - elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}" - - elog "See README.install for more information about the change." - - if use gnome-keyring; then - elog "For autologin to unlock your keyring, you need to set an empty" - elog "password on your keyring. Use app-crypt/seahorse for that." - fi - - if [ -f "/etc/X11/gdm/gdm.conf" ]; then - elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" - elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" - mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 - fi - - # Soft restart, assumes Gentoo defaults for file locations - # Do restart after gdm.conf move above - FIFOFILE=/var/gdm/.gdmfifo - PIDFILE=/var/run/gdm.pid - - if [ -w ${FIFOFILE} ] ; then - if [ -f ${PIDFILE} ] ; then - if kill -0 `cat ${PIDFILE}`; then - (echo;echo SOFT_RESTART) >> ${FIFOFILE} - fi - fi - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [ "$(rc-config list default | grep xdm)" != "" ] ; then - elog "To remove GDM from startup please execute" - elog "'rc-update del xdm default'" - fi -} diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml index ded957cd0f30..78fb7ea43f02 100644 --- a/gnome-base/gdm/metadata.xml +++ b/gnome-base/gdm/metadata.xml @@ -4,13 +4,9 @@ gnome Enable support for sys-process/audit - Allow proper handling of removable media according - to who is actually present on the machine. - Enables Distributed Multihead X (DMX) support Enables experimental fingerprint authentication using sys-auth/fprintd Enable support for smooth transition from sys-boot/plymouth - Enables support for secure remote connections diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest deleted file mode 100644 index 90fbb8b95853..000000000000 --- a/gnome-base/gnome-applets/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnome-applets-2.32.1.1.tar.bz2 10083534 SHA256 2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327 SHA512 2fa14922d55e24187714e3fc71e8b225a64efc1c7c10d33a7058cb8912a571abf1b545028604430a1fc5c75aa9202ee35f611ead2e435c6f1c532ca912792403 WHIRLPOOL 0528accfb0fc9f94407ae2b05656a51909f7e1976a713783687809989e65715d52b1530a637c185aa37958039b4b8dec3125c553c807a6b665f78c173ecf481e diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-dbus-fix.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-dbus-fix.patch deleted file mode 100644 index 16c2999a84e8..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-dbus-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fe72f63c91a1458d97d455ab0078d042464366e7 Mon Sep 17 00:00:00 2001 -From: Enrico Minack -Date: Mon, 03 Jan 2011 19:58:13 +0000 -Subject: gweather: fixes NetworkManager support to compile, see bug 636217 - ---- -diff --git a/gweather/Makefile.am b/gweather/Makefile.am -index ea6ac96..165efda 100644 ---- a/gweather/Makefile.am -+++ b/gweather/Makefile.am -@@ -6,6 +6,7 @@ INCLUDES = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\" \ -+ $(DBUS_CFLAGS) \ - $(GNOME_APPLETS3_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ - $(LIBGWEATHER_CFLAGS) \ -@@ -22,6 +23,7 @@ gweather_applet_2_SOURCES = \ - gweather-applet.c gweather-applet.h - - gweather_applet_2_LDADD = \ -+ $(DBUS_LIBS) \ - $(LIBNOTIFY_LIBS) \ - $(GNOME_APPLETS3_LIBS) \ - $(GNOME_LIBS2_LIBS) \ --- -cgit v0.8.3.4 diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch deleted file mode 100644 index f2b889ec0324..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- battstat/battstat_applet.c -+++ battstat/battstat_applet.c -@@ -42,6 +42,9 @@ - - #ifdef HAVE_LIBNOTIFY - #include -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif - - #include "battstat.h" -@@ -435,7 +438,12 @@ - GTK_ICON_LOOKUP_USE_BUILTIN, - NULL); - -- NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet); -+ NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , applet); -+#endif - - /* XXX: it would be nice to pass this as a named icon */ - notify_notification_set_icon_from_pixbuf (n, icon); ---- gweather/gweather-applet.c -+++ gweather/gweather-applet.c -@@ -30,6 +30,9 @@ - #ifdef HAVE_LIBNOTIFY - #include - #include -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE -@@ -471,8 +474,12 @@ - if (icon == NULL) - icon = "stock-unknown"; - -- n = notify_notification_new (message, detail, icon, -- gw_applet->container); -+ n = notify_notification_new (message, detail, icon -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , gw_applet->container); -+#endif - - notify_notification_show (n, &error); - if (error) diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch deleted file mode 100644 index 813f336853b9..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f2a7c6548ad508c94398e10c49c962363e15d739 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 19 Sep 2012 18:27:22 -0400 -Subject: [PATCH] configure: add -lm dependency on mixer libs - -the mixer applet requires -lm to build. -this commit adds that dependency. ---- - configure.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.in b/configure.in -index 7c1c8fc..b318fb5 100644 ---- a/configure.in -+++ b/configure.in -@@ -297,6 +297,7 @@ if test "x$enable_mixer" != "xno"; then - AC_MSG_ERROR([Mixer applet explicitly requested but a compatible gstreamer version was not found]) - fi - fi -+MIXER_LIBS="$MIXER_LIBS -lm" - AM_CONDITIONAL(BUILD_MIXER_APPLET, test "x$enable_mixer" = "xyes") - AC_SUBST(MIXER_CFLAGS) - AC_SUBST(MIXER_LIBS) --- -1.8.5.2 - diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-underlinking.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-underlinking.patch deleted file mode 100644 index c8308ef46aaa..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-underlinking.patch +++ /dev/null @@ -1,117 +0,0 @@ - geyes/Makefile.am | 2 +- - geyes/Makefile.in | 2 +- - multiload/Makefile.am | 3 ++- - multiload/Makefile.in | 1 + - stickynotes/Makefile.am | 3 ++- - stickynotes/Makefile.in | 3 ++- - trashapplet/src/Makefile.am | 3 ++- - trashapplet/src/Makefile.in | 3 ++- - 8 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/geyes/Makefile.am b/geyes/Makefile.am -index 7668b4c..18cd851 100644 ---- a/geyes/Makefile.am -+++ b/geyes/Makefile.am -@@ -16,7 +16,7 @@ geyes_applet2_SOURCES = \ - geyes.h - - geyes_applet2_LDADD = \ -- $(GNOME_APPLETS3_LIBS) -+ $(GNOME_APPLETS3_LIBS) -lm - - appletdir = $(datadir)/gnome-panel/applets - applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in -diff --git a/geyes/Makefile.in b/geyes/Makefile.in -index cfededa..afe87e2 100644 ---- a/geyes/Makefile.in -+++ b/geyes/Makefile.in -@@ -384,7 +384,7 @@ geyes_applet2_SOURCES = \ - geyes.h - - geyes_applet2_LDADD = \ -- $(GNOME_APPLETS3_LIBS) -+ $(GNOME_APPLETS3_LIBS) -lm - - appletdir = $(datadir)/gnome-panel/applets - applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in -diff --git a/multiload/Makefile.am b/multiload/Makefile.am -index 53b3147..8fe2b9f 100644 ---- a/multiload/Makefile.am -+++ b/multiload/Makefile.am -@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \ - multiload_applet_2_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ - $(GTOP_APPLETS_LIBS) \ -- $(GNOMEDESKTOP_LIBS) -+ $(GNOMEDESKTOP_LIBS) \ -+ -lm - - schemasdir = @GCONF_SCHEMA_FILE_DIR@ - schemas_in_files = multiload.schemas.in -diff --git a/multiload/Makefile.in b/multiload/Makefile.in -index b86d621..bf13bd8 100644 ---- a/multiload/Makefile.in -+++ b/multiload/Makefile.in -@@ -395,6 +395,7 @@ multiload_applet_2_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ - $(GTOP_APPLETS_LIBS) \ - $(GNOMEDESKTOP_LIBS) -+ -lm - - schemasdir = @GCONF_SCHEMA_FILE_DIR@ - schemas_in_files = multiload.schemas.in -diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am -index c279952..65f5502 100644 ---- a/stickynotes/Makefile.am -+++ b/stickynotes/Makefile.am -@@ -35,7 +35,8 @@ stickynotes_applet_SOURCES = \ - stickynotes_applet_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ - $(LIBWNCK_LIBS) \ -- $(XML2_LIBS) -+ $(XML2_LIBS) \ -+ $(X_LIBS) - - builder_DATA = $(builder_files) - -diff --git a/stickynotes/Makefile.in b/stickynotes/Makefile.in -index 5442614..2e8167b 100644 ---- a/stickynotes/Makefile.in -+++ b/stickynotes/Makefile.in -@@ -413,7 +413,8 @@ schemas_in_files = stickynotes.schemas.in - @BUILD_STICKYNOTES_APPLET_TRUE@stickynotes_applet_LDADD = \ - @BUILD_STICKYNOTES_APPLET_TRUE@ $(GNOME_APPLETS3_LIBS) \ - @BUILD_STICKYNOTES_APPLET_TRUE@ $(LIBWNCK_LIBS) \ --@BUILD_STICKYNOTES_APPLET_TRUE@ $(XML2_LIBS) -+@BUILD_STICKYNOTES_APPLET_TRUE@ $(XML2_LIBS) \ -+@BUILD_STICKYNOTES_APPLET_TRUE@ $(X_LIBS) - - @BUILD_STICKYNOTES_APPLET_TRUE@builder_DATA = $(builder_files) - @BUILD_STICKYNOTES_APPLET_TRUE@uidir = $(datadir)/gnome-2.0/ui -diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am -index 52da653..05ba024 100644 ---- a/trashapplet/src/Makefile.am -+++ b/trashapplet/src/Makefile.am -@@ -14,6 +14,7 @@ trashapplet_SOURCES = \ - - trashapplet_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ -- $(GIO_LIBS) -+ $(GIO_LIBS) \ -+ $(X_LIBS) - - -include $(top_srcdir)/git.mk -diff --git a/trashapplet/src/Makefile.in b/trashapplet/src/Makefile.in -index f006b80..a6ee115 100644 ---- a/trashapplet/src/Makefile.in -+++ b/trashapplet/src/Makefile.in -@@ -320,7 +320,8 @@ trashapplet_SOURCES = \ - - trashapplet_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ -- $(GIO_LIBS) -+ $(GIO_LIBS) \ -+ $(X_LIBS) - - all: all-am - diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild deleted file mode 100644 index df97274ea6ae..000000000000 --- a/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1-r2.ebuild,v 1.9 2014/01/05 08:40:17 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME_TARBALL_SUFFIX="bz2" -PYTHON_DEPEND="2:2.5" - -inherit eutils gnome2 python autotools - -DESCRIPTION="Applets for the GNOME Desktop and Panel" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 FDL-1.1 LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" -IUSE="+cpufreq gstreamer ipv6 networkmanager policykit" - -# TODO: configure says python stuff is optional -# null applet still needs bonobo support for gnome-panel -RDEPEND=">=x11-libs/gtk+-2.20:2 - >=dev-libs/glib-2.22:2 - >=gnome-base/gconf-2.8:2 - >=gnome-base/gnome-panel-2.31.2[bonobo] - >=x11-libs/libxklavier-4.0 - >=x11-libs/libwnck-2.9.3:1 - >=gnome-base/gnome-desktop-2.11.1:2 - >=x11-libs/libnotify-0.3.2 - >=sys-apps/dbus-1.1.2 - >=dev-libs/dbus-glib-0.74 - >=dev-libs/libxml2-2.5.0:2 - >=x11-themes/gnome-icon-theme-2.15.91 - >=dev-libs/libgweather-2.22.1:2 - =gnome-extra/gucharmap-2.23:0 - >=gnome-base/libgtop-2.11.92:2 - >=dev-python/pygobject-2.6:2 - >=dev-python/pygtk-2.6:2 - >=dev-python/gconf-python-2.10:2 - >=dev-python/gnome-applets-python-2.10 - - cpufreq? ( sys-power/cpufrequtils ) - gstreamer? ( - >=media-libs/gstreamer-0.10.2:0.10 - >=media-libs/gst-plugins-base-0.10.14:0.10 - || ( - >=media-plugins/gst-plugins-alsa-0.10.14:0.10 - >=media-plugins/gst-plugins-oss-0.10.14:0.10 ) ) - networkmanager? ( >=net-misc/networkmanager-0.7.0 ) - policykit? ( >=sys-auth/polkit-0.92 )" - -DEPEND="${RDEPEND} - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2 - virtual/pkgconfig - >=dev-util/intltool-0.35 - dev-libs/libxslt - ~app-text/docbook-xml-dtd-4.3 - gnome-base/gnome-common" -# gnome-base/gnome-common for eautoreconf - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - DOCS="AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} - --without-hal - --disable-battstat - --disable-schemas-install - $(use_enable gstreamer mixer-applet) - $(use_enable ipv6) - $(use_enable networkmanager) - $(use_enable policykit polkit)" - # configure is broken and hiddenly disables cpufreq always, bug #439768 - ! use cpufreq && G2CONF+=" --disable-cpufreq" - - epatch \ - "${FILESDIR}"/${P}-libnotify-0.7.patch \ - "${FILESDIR}"/${P}-underlinking.patch - - # gweather: fix NetworkManager support to compile, see upstream bug 636217 and bug 358043 - epatch "${FILESDIR}"/${P}-dbus-fix.patch - - # underlinking in mixer applet, bug #497118 - epatch "${FILESDIR}/${P}-mixer-libm.patch" - - # Invest applet tests need gconf/proxy/... - sed 's/^TESTS.*/TESTS=/g' -i invest-applet/invest/Makefile.am \ - invest-applet/invest/Makefile.in || die "disabling invest tests failed" - - python_clean_py-compile_files - python_convert_shebangs -r 2 . - - rm missing || die # old missing script causes autoreconf warnings - eautoreconf - gnome2_src_prepare -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - emake check -} - -src_install() { - gnome2_src_install - - local APPLETS="accessx-status charpick drivemount geyes - gkb-new gswitchit gweather invest-applet mini-commander - mixer modemlights multiload null_applet stickynotes trashapplet" - use cpufreq && APPLETS="${APPLETS} cpufreq" - - # modemlights is out because it needs system-tools-backends-1 - - for applet in ${APPLETS} ; do - docinto ${applet} - - for d in AUTHORS ChangeLog NEWS README README.themes TODO ; do - [ -s ${applet}/${d} ] && dodoc ${applet}/${d} - done - done -} - -pkg_postinst() { - gnome2_pkg_postinst - - # check for new python modules on bumps - python_mod_optimize invest -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup invest -} diff --git a/gnome-base/gnome-applets/metadata.xml b/gnome-base/gnome-applets/metadata.xml deleted file mode 100644 index 22ef4c754fe2..000000000000 --- a/gnome-base/gnome-applets/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - -gnome - - Build cpu frequency scaling monitor applet - - diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 933ae18d5f4e..c09a75cb8c1d 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,2 +1 @@ -DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4 DIST gnome-control-center-3.12.1.tar.xz 6866544 SHA256 5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582 SHA512 35b765fc11182b0f7eec6bc31934f51ccbf01dde9f2e7deed6c84ca9811bd0a00783d75bd3fab7004fe41cc29740b6d6e0a7f3c6391a482eefcab0129d0278fe WHIRLPOOL 294a2f81a1b225814fd895dc7b579f0dec9c360983d3d683b4ff5bd47dd9ac91a84088485f872a7ef95e05f021469da9eaf5d987bd537a062f9a1525c03c4b47 diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-duplicated-background.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-duplicated-background.patch deleted file mode 100644 index 7b4250559ad4..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-duplicated-background.patch +++ /dev/null @@ -1,115 +0,0 @@ -Index: gnome-control-center-2.32.1/capplets/appearance/appearance-desktop.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/appearance/appearance-desktop.c -+++ gnome-control-center-2.32.1/capplets/appearance/appearance-desktop.c -@@ -48,6 +48,50 @@ static const GtkTargetEntry drag_types[] - - static void wp_update_preview (GtkFileChooser *chooser, AppearanceData *data); - -+static GnomeWPItem * -+lookup_with_symlink (AppearanceData *data, -+ const char *path, -+ char **real_path) -+{ -+ GnomeWPItem *item; -+ gchar *readlink; -+ -+ if (real_path) -+ *real_path = NULL; -+ -+ if (!path) -+ return NULL; -+ -+ item = g_hash_table_lookup (data->wp_hash, path); -+ if (item) -+ return item; -+ -+ /* if the current background is not in the hash of known backgrounds, -+ * see if it's a symlink and if the file it points to is in the hash */ -+ -+ readlink = g_strdup (path); -+ -+ while (readlink && -+ g_file_test (readlink, G_FILE_TEST_IS_SYMLINK) && -+ item == NULL) { -+ gchar *new; -+ -+ new = g_file_read_link (readlink, NULL); -+ g_free (readlink); -+ readlink = new; -+ -+ if (readlink) -+ item = g_hash_table_lookup (data->wp_hash, readlink); -+ } -+ -+ if (item != NULL && real_path) -+ *real_path = readlink; -+ else -+ g_free (readlink); -+ -+ return item; -+} -+ - static void - select_item (AppearanceData *data, - GnomeWPItem * item, -@@ -418,11 +462,16 @@ wp_uri_changed (const gchar *uri, - AppearanceData *data) - { - GnomeWPItem *item, *selected; -+ gchar *realuri; -+ -+ realuri = NULL; -+ item = lookup_with_symlink (data, uri, &realuri); -+ if (!realuri) -+ realuri = g_strdup (uri); - -- item = g_hash_table_lookup (data->wp_hash, uri); - selected = get_selected_item (data, NULL); - -- if (selected != NULL && strcmp (selected->filename, uri) != 0) -+ if (selected != NULL && strcmp (selected->filename, realuri) != 0) - { - if (item == NULL) - item = wp_add_image (data, uri); -@@ -430,6 +479,8 @@ wp_uri_changed (const gchar *uri, - if (item) - select_item (data, item, TRUE); - } -+ -+ g_free (realuri); - } - - static void -@@ -936,6 +987,7 @@ wp_load_stuffs (void *user_data) - AppearanceData *data; - gchar *imagepath, *uri, *style; - GnomeWPItem *item; -+ gchar *realpath; - - data = (AppearanceData *) user_data; - -@@ -971,7 +1023,12 @@ wp_load_stuffs (void *user_data) - - g_free (uri); - -- item = g_hash_table_lookup (data->wp_hash, imagepath); -+ realpath = NULL; -+ item = lookup_with_symlink (data, imagepath, &realpath); -+ if (realpath) { -+ g_free (imagepath); -+ imagepath = realpath; -+ } - - if (item != NULL) - { -@@ -986,7 +1043,9 @@ wp_load_stuffs (void *user_data) - wp_props_load_wallpaper (item->filename, item, data); - } - -+ data->wp_update_gconf = FALSE; - select_item (data, item, FALSE); -+ data->wp_update_gconf = TRUE; - } - } - else if (strcmp (style, "none") != 0) diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-erase-background.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-erase-background.patch deleted file mode 100644 index 00be2f2eb0fc..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-erase-background.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/appearance-desktop.c gnome-control-center-2.32.0.new/capplets/appearance/appearance-desktop.c ---- a/capplets/appearance/appearance-desktop.c 2010-09-21 08:54:55.000000000 -0400 -+++ b/capplets/appearance/appearance-desktop.c 2010-11-05 20:51:53.867234128 -0400 -@@ -1225,6 +1225,7 @@ desktop_init (AppearanceData *data, - GtkCellRenderer *cr; - char *url; - -+ data->wp_xml_list_loaded = FALSE; - data->wp_update_gconf = TRUE; - - data->wp_uris = NULL; -diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/appearance.h gnome-control-center-2.32.0.new/capplets/appearance/appearance.h ---- a/capplets/appearance/appearance.h 2010-09-21 08:54:55.000000000 -0400 -+++ b/capplets/appearance/appearance.h 2010-11-05 20:51:58.050214779 -0400 -@@ -41,6 +41,7 @@ typedef struct - - /* desktop */ - GHashTable *wp_hash; -+ gboolean wp_xml_list_loaded; - gboolean wp_update_gconf; - GtkIconView *wp_view; - GtkTreeModel *wp_model; -diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/gnome-wp-xml.c gnome-control-center-2.32.0.new/capplets/appearance/gnome-wp-xml.c ---- a/capplets/appearance/gnome-wp-xml.c 2010-09-21 08:54:55.000000000 -0400 -+++ b/capplets/appearance/gnome-wp-xml.c 2010-11-05 20:54:03.198634367 -0400 -@@ -378,6 +378,8 @@ void gnome_wp_xml_load_list (AppearanceD - gnome_wp_xml_load_from_dir (WALLPAPER_DATADIR, data); - - gnome_wp_load_legacy (data); -+ -+ data->wp_xml_list_loaded = TRUE; - } - - static void gnome_wp_list_flatten (const gchar * key, GnomeWPItem * item, -@@ -394,6 +396,11 @@ void gnome_wp_xml_save_list (AppearanceD - GSList * list = NULL; - gchar * wpfile; - -+ if (!data->wp_xml_list_loaded) { -+ g_hash_table_destroy (data->wp_hash); -+ return; -+ } -+ - g_hash_table_foreach (data->wp_hash, - (GHFunc) gnome_wp_list_flatten, &list); - g_hash_table_destroy (data->wp_hash); diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch deleted file mode 100644 index 7eed7a309085..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-gmodule.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am -index 70ad44f..52ea6e6 100644 ---- a/capplets/common/Makefile.am -+++ b/capplets/common/Makefile.am -@@ -48,7 +48,8 @@ libcommon_la_LIBADD = \ - $(METACITY_LIBS) \ - $(DBUS_LIBS) \ - $(GNOME_DESKTOP_LIBS) \ -- $(GIO_LIBS) -+ $(GIO_LIBS) \ -+ $(GMODULE_LIBS) - - gnome_theme_test_SOURCES = \ - gnome-theme-test.c -diff --git a/configure.ac b/configure.ac -index 4bc8d9b..f869f93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -132,6 +132,7 @@ PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1) - PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0) - PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon) - PKG_CHECK_MODULES(GIO, gio-2.0) -+PKG_CHECK_MODULES(GMODULE, gmodule-2.0) - - gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0` - gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0` -diff --git a/libwindow-settings/Makefile.am b/libwindow-settings/Makefile.am -index ee6984d..0464597 100644 ---- a/libwindow-settings/Makefile.am -+++ b/libwindow-settings/Makefile.am -@@ -17,7 +17,9 @@ libgnome_window_settings_la_LDFLAGS = \ - -no-undefined \ - -version-info 1:0:0 - --libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS) -+libgnome_window_settings_la_LIBADD = \ -+ $(GNOMECC_LIBS) \ -+ $(GMODULE_LIBS) - - libgnome_window_settings_la_SOURCES = \ - gnome-window-manager.c \ diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler.patch deleted file mode 100644 index 6ab26b817fda..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler.patch +++ /dev/null @@ -1,1274 +0,0 @@ -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-03-27 15:31:26.000000000 +0200 -@@ -64,83 +64,26 @@ - } - - static void --web_radiobutton_toggled_cb (GtkWidget *togglebutton, GnomeDACapplet *capplet) --{ -- gint index; -- GnomeDAWebItem *item; -- const gchar *command; -- GError *error = NULL; -- -- index = gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->web_combo_box)); -- -- if (index == -1) -- return; -- -- item = (GnomeDAWebItem *) g_list_nth_data (capplet->web_browsers, index); -- if (item == NULL) -- return; -- -- if (togglebutton == capplet->new_win_radiobutton) { -- command = item->win_command; -- } -- else if (togglebutton == capplet->new_tab_radiobutton) { -- command = item->tab_command; -- } -- else { -- command = item->generic.command; -- } -- -- gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error); -- -- gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry), command); -- -- if (error != NULL) { -- g_warning (_("Error saving configuration: %s"), error->message); -- g_error_free (error); -- } --} -- --static void - web_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) - { - guint current_index; -- gboolean is_custom_active; -- gboolean has_net_remote; -- GnomeDAWebItem *item; -- GtkWidget *active = NULL; - - current_index = gtk_combo_box_get_active (combo); - - if (current_index < g_list_length (capplet->web_browsers)) { -+ GnomeDAURLItem *item; -+ GError *error = NULL; - -- item = (GnomeDAWebItem*) g_list_nth_data (capplet->web_browsers, current_index); -- has_net_remote = item->netscape_remote; -- is_custom_active = FALSE; -- -- } -- else { -- has_net_remote = FALSE; -- is_custom_active = TRUE; -- } -- gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote); -- gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote); -- gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote); -- -- gtk_widget_set_sensitive (capplet->web_browser_command_entry, is_custom_active); -- gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active); -- gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active); -- -- if (has_net_remote) { -- -- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton))) -- active = capplet->new_win_radiobutton; -- else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton))) -- active = capplet->new_tab_radiobutton; -- else -- active = capplet->default_radiobutton; -+ item = (GnomeDAURLItem*) g_list_nth_data (capplet->web_browsers, current_index); -+ if (item == NULL) -+ return; -+ -+ if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/http", &error) || -+ !g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/https", &error)) { -+ g_warning (_("Error setting default browser: %s"), error->message); -+ g_error_free (error); -+ } - } -- -- web_radiobutton_toggled_cb (active, capplet); - } - - /* FIXME: Refactor these two functions below into one... */ -@@ -148,14 +91,23 @@ - mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) - { - guint current_index; -- gboolean is_custom_active; - - current_index = gtk_combo_box_get_active (combo); -- is_custom_active = (current_index >= g_list_length (capplet->mail_readers)); - -- gtk_widget_set_sensitive (capplet->mail_reader_command_entry, is_custom_active); -- gtk_widget_set_sensitive (capplet->mail_reader_command_label, is_custom_active); -- gtk_widget_set_sensitive (capplet->mail_reader_terminal_checkbutton, is_custom_active); -+ if (current_index < g_list_length (capplet->mail_readers)) { -+ GnomeDAURLItem *item; -+ GError *error = NULL; -+ -+ item = (GnomeDAURLItem*) g_list_nth_data (capplet->mail_readers, current_index); -+ if (item == NULL) -+ return; -+ -+ if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/mailto", &error)) { -+ g_warning (_("Error setting default mailer: %s"), error->message); -+ g_error_free (error); -+ } -+ } -+ - } - - static void -@@ -297,221 +249,6 @@ - return (strcmp (((GnomeDAItem *) list_item)->command, (gchar *) command)); - } - --static gint --web_item_comp (gconstpointer item, gconstpointer command) --{ -- GnomeDAWebItem *web_list_item; -- -- web_list_item = (GnomeDAWebItem *) item; -- -- if (strcmp (web_list_item->generic.command, (gchar *) command) == 0) -- return 0; -- -- if (web_list_item->netscape_remote) { -- if (strcmp (web_list_item->tab_command, (gchar *) command) == 0) -- return 0; -- -- if (strcmp (web_list_item->win_command, (gchar *) command) == 0) -- return 0; -- } -- -- return (strcmp (web_list_item->generic.command, (gchar *) command)); --} -- --static void --web_gconf_changed_cb (GConfPropertyEditor *peditor, gchar *key, GConfValue *value, GnomeDACapplet *capplet) --{ -- GConfChangeSet *cs; -- GError *error = NULL; -- GList *list_entry; -- -- /* This function is used to update HTTPS,ABOUT and UNKNOWN handlers, which -- * should also use the same value as HTTP -- */ -- -- if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) { -- gchar *short_browser, *pos; -- const gchar *value_str = gconf_value_get_string (value); -- -- cs = gconf_change_set_new (); -- -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value); -- pos = strstr (value_str, " "); -- if (pos == NULL) -- short_browser = g_strdup (value_str); -- else -- short_browser = g_strndup (value_str, pos - value_str); -- gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser); -- g_free (short_browser); -- -- list_entry = g_list_find_custom (capplet->web_browsers, -- value_str, -- (GCompareFunc) web_item_comp); -- -- if (list_entry) { -- GnomeDAWebItem *item = (GnomeDAWebItem *) list_entry->data; -- -- gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote); -- } -- -- gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); -- -- if (error != NULL) { -- g_warning (_("Error saving configuration: %s"), error->message); -- g_error_free (error); -- error = NULL; -- } -- -- gconf_change_set_unref (cs); -- } -- else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) { -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton), -- gconf_value_get_bool (value)); -- -- cs = gconf_change_set_new (); -- -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value); -- gconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value); -- -- gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); -- -- if (error != NULL) { -- g_warning (_("Error saving configuration: %s"), error->message); -- g_error_free (error); -- error = NULL; -- } -- -- gconf_change_set_unref (cs); -- } --} -- --static void --web_browser_update_radio_buttons (GnomeDACapplet *capplet, const gchar *command) --{ -- GList *entry; -- gboolean has_net_remote; -- -- entry = g_list_find_custom (capplet->web_browsers, command, (GCompareFunc) web_item_comp); -- -- if (entry) { -- GnomeDAWebItem *item = (GnomeDAWebItem *) entry->data; -- -- has_net_remote = item->netscape_remote; -- -- if (has_net_remote) { -- /* disable "toggle" signal emitting, thus preventing calling this function twice */ -- g_signal_handlers_block_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_block_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_block_matched (capplet->new_win_radiobutton,G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->default_radiobutton), -- strcmp (item->generic.command, command) == 0); -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton), -- strcmp (item->tab_command, command) == 0); -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton), -- strcmp (item->win_command, command) == 0); -- -- g_signal_handlers_unblock_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_unblock_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- g_signal_handlers_unblock_matched (capplet->new_win_radiobutton, G_SIGNAL_MATCH_FUNC, 0, -- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); -- } -- } -- else { -- has_net_remote = FALSE; -- } -- -- gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote); -- gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote); -- gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote); --} -- --static GConfValue* --web_combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value) --{ -- GConfValue *ret; -- GList *entry, *handlers; -- const gchar *command; -- gint index; -- GnomeDACapplet *capplet; -- -- g_object_get (G_OBJECT (peditor), "data", &capplet, NULL); -- -- command = gconf_value_get_string (value); -- handlers = capplet->web_browsers; -- -- if (handlers) -- { -- entry = g_list_find_custom (handlers, command, (GCompareFunc) web_item_comp); -- if (entry) -- index = g_list_position (handlers, entry); -- else -- index = g_list_length (handlers) + 1; -- } -- else -- { -- /* if the item has no handlers lsit then select the Custom item */ -- index = 1; -- } -- -- web_browser_update_radio_buttons (capplet, command); -- -- ret = gconf_value_new (GCONF_VALUE_INT); -- gconf_value_set_int (ret, index); -- -- return ret; --} -- --static GConfValue* --web_combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value) --{ -- GConfValue *ret; -- GList *handlers; -- gint index; -- GnomeDAWebItem *item; -- const gchar *command; -- GnomeDACapplet *capplet; -- -- g_object_get (G_OBJECT (peditor), "data", &capplet, NULL); -- -- index = gconf_value_get_int (value); -- handlers = capplet->web_browsers; -- -- item = g_list_nth_data (handlers, index); -- -- ret = gconf_value_new (GCONF_VALUE_STRING); -- if (!item) -- { -- /* if item was not found, this is probably the "Custom" item */ -- /* XXX: returning "" as the value here is not ideal, but required to -- * prevent the combo box from jumping back to the previous value if the -- * user has selected Custom */ -- gconf_value_set_string (ret, ""); -- return ret; -- } -- else -- { -- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)) && item->netscape_remote == TRUE) -- command = item->win_command; -- else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)) && item->netscape_remote == TRUE) -- command = item->tab_command; -- else -- command = item->generic.command; -- -- gconf_value_set_string (ret, command); -- return ret; -- } --} -- - static GConfValue* - combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value) - { -@@ -632,7 +369,7 @@ - } - - static void --fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) -+fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list, gboolean add_custom) - { - GList *entry; - GtkTreeModel *model; -@@ -644,8 +381,10 @@ - theme = gtk_icon_theme_get_default (); - } - -- gtk_combo_box_set_row_separator_func (combo_box, is_separator, -- GINT_TO_POINTER (g_list_length (app_list)), NULL); -+ if (add_custom) { -+ gtk_combo_box_set_row_separator_func (combo_box, is_separator, -+ GINT_TO_POINTER (g_list_length (app_list)), NULL); -+ } - - model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING)); - gtk_combo_box_set_model (combo_box, model); -@@ -683,13 +422,41 @@ - g_object_unref (pixbuf); - } - -- gtk_list_store_append (GTK_LIST_STORE (model), &iter); -- gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1); -- gtk_list_store_append (GTK_LIST_STORE (model), &iter); -- gtk_list_store_set (GTK_LIST_STORE (model), &iter, -- PIXBUF_COL, NULL, -- TEXT_COL, _("Custom"), -- -1); -+ if (add_custom) { -+ gtk_list_store_append (GTK_LIST_STORE (model), &iter); -+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1); -+ gtk_list_store_append (GTK_LIST_STORE (model), &iter); -+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, -+ PIXBUF_COL, NULL, -+ TEXT_COL, _("Custom"), -+ -1); -+ } -+} -+ -+static void -+select_current_for_uri_scheme (GtkComboBox *combo_box, GList *app_list, const gchar *uri) -+{ -+ GAppInfo *current_default; -+ GList *l; -+ int index; -+ -+ current_default = g_app_info_get_default_for_uri_scheme (uri); -+ if (!current_default) -+ return; -+ -+ index = 0; -+ -+ for (l = app_list; l != NULL; l = l->next) { -+ if (!g_app_info_equal (current_default, ((GnomeDAURLItem *) l->data)->app_info)) { -+ index++; -+ continue; -+ } -+ -+ gtk_combo_box_set_active (combo_box, index); -+ break; -+ } -+ -+ g_object_unref (current_default); - } - - static GtkWidget* -@@ -702,7 +469,6 @@ - static void - show_dialog (GnomeDACapplet *capplet, const gchar *start_page) - { -- GObject *obj; - GtkBuilder *builder; - guint builder_result; - -@@ -732,17 +498,6 @@ - capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog"); - g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL); - -- capplet->web_browser_command_entry = _gtk_builder_get_widget (builder, "web_browser_command_entry"); -- capplet->web_browser_command_label = _gtk_builder_get_widget (builder, "web_browser_command_label"); -- capplet->web_browser_terminal_checkbutton = _gtk_builder_get_widget(builder, "web_browser_terminal_checkbutton"); -- capplet->default_radiobutton = _gtk_builder_get_widget (builder, "web_browser_default_radiobutton"); -- capplet->new_win_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_win_radiobutton"); -- capplet->new_tab_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_tab_radiobutton"); -- -- capplet->mail_reader_command_entry = _gtk_builder_get_widget (builder, "mail_reader_command_entry"); -- capplet->mail_reader_command_label = _gtk_builder_get_widget (builder, "mail_reader_command_label"); -- capplet->mail_reader_terminal_checkbutton = _gtk_builder_get_widget (builder, "mail_reader_terminal_checkbutton"); -- - capplet->terminal_command_entry = _gtk_builder_get_widget (builder, "terminal_command_entry"); - capplet->terminal_command_label = _gtk_builder_get_widget (builder, "terminal_command_label"); - capplet->terminal_exec_flag_entry = _gtk_builder_get_widget (builder, "terminal_exec_flag_entry"); -@@ -770,12 +525,15 @@ - g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet); - screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet); - -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); -+ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); -+ -+ select_current_for_uri_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http"); -+ select_current_for_uri_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto"); - - g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet); - g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet); -@@ -784,53 +542,8 @@ - g_signal_connect (capplet->visual_combo_box, "changed", G_CALLBACK (visual_combo_changed_cb), capplet); - g_signal_connect (capplet->mobility_combo_box, "changed", G_CALLBACK (mobility_combo_changed_cb), capplet); - -- -- g_signal_connect (capplet->default_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); -- g_signal_connect (capplet->new_win_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); -- g_signal_connect (capplet->new_tab_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); -- - /* Setup GConfPropertyEditors */ - -- /* Web Browser */ -- gconf_peditor_new_combo_box (NULL, -- DEFAULT_APPS_KEY_HTTP_EXEC, -- capplet->web_combo_box, -- "conv-from-widget-cb", web_combo_conv_from_widget, -- "conv-to-widget-cb", web_combo_conv_to_widget, -- "data", capplet, -- NULL); -- -- obj = gconf_peditor_new_string (NULL, -- DEFAULT_APPS_KEY_HTTP_EXEC, -- capplet->web_browser_command_entry, -- NULL); -- g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet); -- -- obj = gconf_peditor_new_boolean (NULL, -- DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, -- capplet->web_browser_terminal_checkbutton, -- NULL); -- g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet); -- -- /* Mailer */ -- gconf_peditor_new_combo_box (NULL, -- DEFAULT_APPS_KEY_MAILER_EXEC, -- capplet->mail_combo_box, -- "conv-from-widget-cb", combo_conv_from_widget, -- "conv-to-widget-cb", combo_conv_to_widget, -- "data", capplet->mail_readers, -- NULL); -- -- gconf_peditor_new_string (NULL, -- DEFAULT_APPS_KEY_MAILER_EXEC, -- capplet->mail_reader_command_entry, -- NULL); -- -- gconf_peditor_new_boolean (NULL, -- DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, -- capplet->mail_reader_terminal_checkbutton, -- NULL); -- - /* Media player */ - gconf_peditor_new_combo_box (NULL, - DEFAULT_APPS_KEY_MEDIA_EXEC, -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.h gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.h ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.h 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.h 2011-03-27 15:31:26.000000000 +0200 -@@ -85,17 +85,6 @@ - GtkWidget *visual_combo_box; - GtkWidget *mobility_combo_box; - -- GtkWidget *web_browser_command_entry; -- GtkWidget *web_browser_command_label; -- GtkWidget *web_browser_terminal_checkbutton; -- GtkWidget *default_radiobutton; -- GtkWidget *new_win_radiobutton; -- GtkWidget *new_tab_radiobutton; -- -- GtkWidget *mail_reader_command_entry; -- GtkWidget *mail_reader_command_label; -- GtkWidget *mail_reader_terminal_checkbutton; -- - GtkWidget *terminal_command_entry; - GtkWidget *terminal_command_label; - GtkWidget *terminal_exec_flag_entry; -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.c gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.c 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c 2011-03-27 15:31:26.000000000 +0200 -@@ -21,12 +21,12 @@ - #include "gnome-da-capplet.h" - #include "gnome-da-item.h" - --GnomeDAWebItem* --gnome_da_web_item_new (void) -+GnomeDAURLItem* -+gnome_da_url_item_new (void) - { -- GnomeDAWebItem *item = NULL; -+ GnomeDAURLItem *item = NULL; - -- item = g_new0 (GnomeDAWebItem, 1); -+ item = g_new0 (GnomeDAURLItem, 1); - - return item; - } -@@ -72,7 +72,7 @@ - } - - void --gnome_da_web_item_free (GnomeDAWebItem *item) -+gnome_da_url_item_free (GnomeDAURLItem *item) - { - g_return_if_fail (item != NULL); - -@@ -82,8 +82,7 @@ - g_free (item->generic.icon_name); - g_free (item->generic.icon_path); - -- g_free (item->tab_command); -- g_free (item->win_command); -+ g_object_unref (item->app_info); - - g_free (item); - } -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.h gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.h 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h 2011-03-27 15:31:26.000000000 +0200 -@@ -25,7 +25,7 @@ - - typedef struct _GnomeDAItem GnomeDAItem; - --typedef struct _GnomeDAWebItem GnomeDAWebItem; -+typedef struct _GnomeDAURLItem GnomeDAURLItem; - typedef struct _GnomeDATermItem GnomeDATermItem; - typedef struct _GnomeDASimpleItem GnomeDASimpleItem; - typedef struct _GnomeDAVisualItem GnomeDAVisualItem; -@@ -39,17 +39,14 @@ - gchar *icon_path; - }; - --struct _GnomeDAWebItem { -+struct _GnomeDASimpleItem { - GnomeDAItem generic; - gboolean run_in_terminal; -- gboolean netscape_remote; -- gchar *tab_command; -- gchar *win_command; - }; - --struct _GnomeDASimpleItem { -+struct _GnomeDAURLItem { - GnomeDAItem generic; -- gboolean run_in_terminal; -+ GAppInfo *app_info; - }; - - struct _GnomeDATermItem { -@@ -67,13 +64,13 @@ - gboolean run_at_startup; - }; - --GnomeDAWebItem* gnome_da_web_item_new (void); - GnomeDATermItem* gnome_da_term_item_new (void); -+GnomeDAURLItem* gnome_da_url_item_new (void); - GnomeDASimpleItem* gnome_da_simple_item_new (void); - GnomeDAVisualItem* gnome_da_visual_item_new (void); - GnomeDAMobilityItem* gnome_da_mobility_item_new (void); --void gnome_da_web_item_free (GnomeDAWebItem *item); - void gnome_da_term_item_free (GnomeDATermItem *item); -+void gnome_da_url_item_free (GnomeDAURLItem *item); - void gnome_da_simple_item_free (GnomeDASimpleItem *item); - void gnome_da_visual_item_free (GnomeDAVisualItem *item); - void gnome_da_mobility_item_free (GnomeDAMobilityItem *item); -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-xml.c gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-xml.c 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c 2011-03-27 15:31:26.000000000 +0200 -@@ -47,7 +47,7 @@ - if (!xmlStrncmp (element->name, xml_val_name, len)) { - xmlChar *cont = xmlNodeGetContent (element); - -- if (!xmlStrcasecmp (cont, "true") || !xmlStrcasecmp (cont, "1")) -+ if (!xmlStrcasecmp (cont, (const xmlChar *) "true") || !xmlStrcasecmp (cont, (const xmlChar *) "1")) - ret_val = TRUE; - else - ret_val = FALSE; -@@ -91,7 +91,7 @@ - } - else { - for (i = 0; sys_langs[i] != NULL; i++) { -- if (!strcmp (sys_langs[i], node_lang)) { -+ if (!strcmp ((const char *) sys_langs[i], (const char *) node_lang)) { - ret_val = (gchar *) xmlNodeGetContent (element); - /* since sys_langs is sorted from most desirable to - * least desirable, exit at first match -@@ -109,7 +109,7 @@ - } - - static gboolean --is_executable_valid (gchar *executable) -+is_executable_valid (const gchar *executable) - { - gchar *path; - -@@ -129,8 +129,6 @@ - xmlDoc *xml_doc; - xmlNode *root, *section, *element; - gchar *executable; -- GnomeDAWebItem *web_item; -- GnomeDASimpleItem *mail_item; - GnomeDASimpleItem *media_item; - GnomeDATermItem *term_item; - GnomeDAVisualItem *visual_item; -@@ -144,56 +142,9 @@ - root = xmlDocGetRootElement (xml_doc); - - for (section = root->children; section != NULL; section = section->next) { -- if (!xmlStrncmp (section->name, "web-browsers", 12)) { -+ if (!xmlStrncmp (section->name, (const xmlChar *) "terminals", 9)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "web-browser", 11)) { -- executable = gnome_da_xml_get_string (element, "executable"); -- if (is_executable_valid (executable)) { -- web_item = gnome_da_web_item_new (); -- -- web_item->generic.name = gnome_da_xml_get_string (element, "name"); -- web_item->generic.executable = executable; -- web_item->generic.command = gnome_da_xml_get_string (element, "command"); -- web_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -- -- web_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); -- web_item->netscape_remote = gnome_da_xml_get_bool (element, "netscape-remote"); -- if (web_item->netscape_remote) { -- web_item->tab_command = gnome_da_xml_get_string (element, "tab-command"); -- web_item->win_command = gnome_da_xml_get_string (element, "win-command"); -- } -- -- capplet->web_browsers = g_list_append (capplet->web_browsers, web_item); -- } -- else -- g_free (executable); -- } -- } -- } -- else if (!xmlStrncmp (section->name, "mail-readers", 12)) { -- for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "mail-reader", 11)) { -- executable = gnome_da_xml_get_string (element, "executable"); -- if (is_executable_valid (executable)) { -- mail_item = gnome_da_simple_item_new (); -- -- mail_item->generic.name = gnome_da_xml_get_string (element, "name"); -- mail_item->generic.executable = executable; -- mail_item->generic.command = gnome_da_xml_get_string (element, "command"); -- mail_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -- -- mail_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); -- -- capplet->mail_readers = g_list_append (capplet->mail_readers, mail_item); -- } -- else -- g_free (executable); -- } -- } -- } -- else if (!xmlStrncmp (section->name, "terminals", 9)) { -- for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "terminal", 8)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "terminal", 8)) { - executable = gnome_da_xml_get_string (element, "executable"); - if (is_executable_valid (executable)) { - term_item = gnome_da_term_item_new (); -@@ -212,9 +163,9 @@ - } - } - } -- else if (!xmlStrncmp (section->name, "media-players", 13)) { -+ else if (!xmlStrncmp (section->name, (const xmlChar *) "media-players", 13)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "media-player", 12)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "media-player", 12)) { - executable = gnome_da_xml_get_string (element, "executable"); - if (is_executable_valid (executable)) { - media_item = gnome_da_simple_item_new (); -@@ -233,9 +184,9 @@ - } - } - } -- else if (!xmlStrncmp (section->name, "a11y-visual", 11)) { -+ else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-visual", 11)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "visual", 6)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "visual", 6)) { - executable = gnome_da_xml_get_string (element,"executable"); - if (is_executable_valid (executable)) { - visual_item = gnome_da_visual_item_new (); -@@ -254,9 +205,9 @@ - } - } - } -- else if (!xmlStrncmp (section->name, "a11y-mobility", 13)) { -+ else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-mobility", 13)) { - for (element = section->children; element != NULL; element = element->next) { -- if (!xmlStrncmp (element->name, "mobility", 8)) { -+ if (!xmlStrncmp (element->name, (const xmlChar *) "mobility", 8)) { - executable = gnome_da_xml_get_string (element,"executable"); - if (is_executable_valid (executable)) { - mobility_item = gnome_da_mobility_item_new (); -@@ -280,11 +231,46 @@ - xmlFreeDoc (xml_doc); - } - -+static GList * -+load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme) -+{ -+ GList *app_list, *l, *ret; -+ -+ app_list = g_app_info_get_all_for_type (scheme); -+ ret = NULL; -+ -+ for (l = app_list; l != NULL; l = l->next) { -+ const gchar *executable; -+ GAppInfo *app_info = l->data; -+ -+ executable = g_app_info_get_executable (app_info); -+ if (is_executable_valid (executable)) { -+ GnomeDAURLItem *url_item; -+ -+ url_item = gnome_da_url_item_new (); -+ url_item->generic.name = g_strdup (g_app_info_get_display_name (app_info)); -+ url_item->generic.executable = g_strdup (executable); -+ url_item->generic.command = g_strdup (g_app_info_get_commandline (app_info)); -+ url_item->generic.icon_name = g_strdup (g_app_info_get_name (app_info)); -+ /* Steal the reference */ -+ url_item->app_info = app_info; -+ -+ ret = g_list_prepend (ret, url_item); -+ } else { -+ g_object_unref (app_info); -+ } -+ } -+ g_list_free (app_list); -+ -+ return g_list_reverse (ret); -+} -+ - void - gnome_da_xml_load_list (GnomeDACapplet *capplet) - { - GDir *app_dir = g_dir_open (GNOMECC_APPS_DIR, 0, NULL); - -+ /* First load all applications from the XML files */ - if (app_dir != NULL) { - const gchar *extra_file; - gchar *filename; -@@ -299,13 +285,17 @@ - } - g_dir_close (app_dir); - } -+ -+ /* Now load URL handlers */ -+ capplet->web_browsers = load_url_handlers (capplet, "x-scheme-handler/http"); -+ capplet->mail_readers = load_url_handlers (capplet, "x-scheme-handler/mailto"); - } - - void - gnome_da_xml_free (GnomeDACapplet *capplet) - { -- g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_web_item_free, NULL); -- g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_simple_item_free, NULL); -+ g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_url_item_free, NULL); -+ g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_url_item_free, NULL); - g_list_foreach (capplet->terminals, (GFunc) gnome_da_term_item_free, NULL); - g_list_foreach (capplet->media_players, (GFunc) gnome_da_simple_item_free, NULL); - g_list_foreach (capplet->visual_ats, (GFunc) gnome_da_visual_item_free, NULL); -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications-properties.ui gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications-properties.ui ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications-properties.ui 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications-properties.ui 2011-03-27 15:31:26.000000000 +0200 -@@ -1,4 +1,4 @@ -- -+ - - - -@@ -69,122 +69,7 @@ - - - -- -- True -- 4 -- 3 -- 12 -- 6 -- -- -- True -- True -- All %s occurrences will be replaced with actual link -- -- -- 1 -- 2 -- 3 -- 4 -- -- -- -- -- -- Run in t_erminal -- True -- False -- True -- False -- True -- True -- -- -- 2 -- 3 -- 3 -- 4 -- GTK_FILL -- -- -- -- -- -- Open link with web browser _default -- True -- False -- True -- False -- True -- True -- True -- -- -- 3 -- GTK_FILL -- -- -- -- -- -- Open link in new _tab -- True -- False -- True -- False -- True -- True -- web_browser_default_radiobutton -- -- -- 3 -- 2 -- 3 -- GTK_FILL -- -- -- -- -- -- Open link in new _window -- True -- False -- True -- False -- True -- True -- web_browser_default_radiobutton -- -- -- 3 -- 1 -- 2 -- GTK_FILL -- -- -- -- -- -- True -- False -- 0 -- C_ommand: -- True -- web_browser_command_entry -- -- -- 3 -- 4 -- GTK_FILL -- -- -- -- -- -- False -- False -- 1 -- -+ - - - -@@ -250,58 +135,7 @@ - - - -- -- True -- 3 -- 12 -- 6 -- -- -- True -- False -- 0 -- Co_mmand: -- True -- mail_reader_command_entry -- -- -- GTK_FILL -- -- -- -- -- -- True -- True -- All %s occurrences will be replaced with actual link -- -- -- 1 -- 2 -- -- -- -- -- -- Run in t_erminal -- True -- False -- True -- False -- True -- True -- -- -- 2 -- 3 -- GTK_FILL -- -- -- -- -- -- 1 -- -+ - - - -diff -ur gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications.xml.in ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications.xml.in 2011-03-27 15:30:55.000000000 +0200 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications.xml.in 2011-03-27 15:31:26.000000000 +0200 -@@ -4,245 +4,6 @@ - - - -- -- -- <_name>Opera -- opera -- opera %s -- opera -- false -- true -- opera -newpage %s -- opera -newwindow %s -- -- -- <_name>Debian Sensible Browser -- sensible-browser -- sensible-browser %s -- -- false -- false -- -- -- <_name>Epiphany Web Browser -- epiphany -- epiphany %s -- web-browser -- false -- true -- epiphany --new-tab %s -- epiphany --new-window %s -- -- -- <_name>Galeon -- galeon -- galeon %s -- galeon -- false -- true -- galeon -n %s -- galeon -w %s -- -- -- <_name>Encompass -- encompass -- encompass %s -- encompass -- false -- false -- -- -- <_name>Firebird -- mozilla-firebird -- mozilla-firebird %s -- -- false -- true -- mozilla-firebird -remote "openurl(%s,new-tab)" -- mozilla-firebird -remote "openurl(%s,new-window)" -- -- -- <_name>Firefox -- firefox -- firefox %s -- firefox -- false -- true -- firefox -new-tab "%s" -- firefox -new-window "%s" -- -- -- <_name>Iceweasel -- iceweasel -- iceweasel %s -- iceweasel -- false -- true -- iceweasel -new-tab "%s" -- iceweasel -new-window "%s" -- -- -- <_name>Mozilla 1.6 -- mozilla-1.6 -- mozilla-1.6 %s -- mozilla-icon -- false -- true -- mozilla-1.6 -remote "openurl(%s,new-tab)" -- mozilla-1.6 -remote "openurl(%s,new-window)" -- -- -- <_name>Mozilla -- mozilla -- mozilla %s -- mozilla-icon -- false -- true -- mozilla -remote "openurl(%s,new-tab)" -- mozilla -remote "openurl(%s,new-window)" -- -- -- <_name>SeaMonkey -- seamonkey -- seamonkey %s -- seamonkey -- false -- true -- seamonkey -remote "openurl(%s,new-tab)" -- seamonkey -remote "openurl(%s,new-window)" -- -- -- <_name>Iceape -- iceape -- iceape %s -- iceape -- false -- true -- iceape -remote "openurl(%s,new-tab)" -- iceape -remote "openurl(%s,new-window)" -- -- -- <_name>Netscape Communicator -- netscape -- netscape %s -- netscape -- false -- true -- netscape -remote "openurl(%s,new-tab)" -- netscape -remote "openurl(%s,new-window)" -- -- -- <_name>Konqueror -- konqueror -- konqueror %s -- konqueror -- false -- false -- -- -- <_name>Midori -- midori -- midori %s -- midori -- false -- false -- -- -- -- -- -- <_name>Evolution Mail Reader -- evolution -- evolution %s -- evolution -- false -- -- -- <_name>Balsa -- balsa -- balsa -m %s -- gnome-balsa2 -- false -- -- -- <_name>KMail -- kmail -- kmail %s -- kmail -- false -- -- -- <_name>Icedove -- icedove -- icedove %s -- icedove -- false -- -- -- <_name>Thunderbird -- thunderbird -- thunderbird %s -- thunderbird -- false -- -- -- <_name>Mozilla Thunderbird -- mozilla-thunderbird -- mozilla-thunderbird %s -- thunderbird -- false -- -- -- <_name>Mozilla Mail -- mozilla -- mozilla -mail %s -- mozilla-mail-icon -- false -- -- -- <_name>SeaMonkey Mail -- seamonkey -- seamonkey -mail %s -- seamonkey -- false -- -- -- <_name>Iceape Mail -- iceape -- iceape -mail %s -- iceape -- false -- -- -- <_name>Mutt -- mutt -- mutt %s -- gnome-mime-application-x-executable -- true -- -- -- <_name>Claws Mail -- claws-mail -- claws-mail --compose %s -- claws-mail -- false -- -- -- <_name>Sylpheed-Claws -- sylpheed-claws -- sylpheed-claws --compose %s -- sylpheed -- false -- -- -- <_name>Sylpheed -- sylpheed -- sylpheed --compose %s -- sylpheed -- false -- -- -- - - - <_name>Debian Terminal Emulator diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler2.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler2.patch deleted file mode 100644 index 046e8a1d4613..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler2.patch +++ /dev/null @@ -1,56 +0,0 @@ - -++ gnome-control-center-2.32.1/debian/patches/141_set_default_internet_apps.patch - -Description: When starting up, read current web and mail values -Author: Michael Terry -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=638771 - -Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-01-05 15:02:37.406338902 -0500 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-01-05 15:02:44.836276440 -0500 -@@ -111,6 +111,34 @@ - } - - static void -+set_combo_to_default_for_scheme (GtkComboBox *combo, GList *handlers, const gchar *scheme) -+{ -+ GAppInfo *type_default; -+ GList *l; -+ int index; -+ -+ type_default = g_app_info_get_default_for_uri_scheme (scheme); -+ index = 0; -+ -+ if (type_default == NULL) -+ return; -+ -+ for (l = handlers; l != NULL; l = l->next) { -+ GnomeDAURLItem *handler = l->data; -+ if (g_app_info_equal(handler->app_info, type_default)) { -+ break; -+ } -+ ++index; -+ } -+ -+ if (l != NULL) { -+ gtk_combo_box_set_active (combo, index); -+ } -+ -+ g_object_unref (type_default); -+} -+ -+static void - media_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) - { - guint current_index; -@@ -507,6 +535,9 @@ - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); - -+ set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http"); -+ set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto"); -+ - g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet); - g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet); - g_signal_connect (capplet->term_combo_box, "changed", G_CALLBACK (terminal_combo_changed_cb), capplet); diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler3.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler3.patch deleted file mode 100644 index 8c9976c7bced..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-mime-handler3.patch +++ /dev/null @@ -1,290 +0,0 @@ - -++ gnome-control-center-2.32.1/debian/patches/142_fix_icons_for_default_apps.patch - -Description: Fix icons for new glib url handlers -Author: Michael Terry -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=638775 - -Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-01-05 16:05:40.623854462 -0500 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-01-05 16:12:03.030460004 -0500 -@@ -35,7 +35,7 @@ - - enum - { -- PIXBUF_COL, -+ ICON_COL, - TEXT_COL, - N_COLUMNS - }; -@@ -193,33 +193,6 @@ - gtk_widget_set_sensitive (capplet->mobility_command_label, is_custom_active); - } - --static void --refresh_combo_box_icons (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) --{ -- GList *entry; -- GnomeDAItem *item; -- GtkTreeModel *model; -- GtkTreeIter iter; -- GdkPixbuf *pixbuf; -- -- for (entry = app_list; entry != NULL; entry = g_list_next (entry)) { -- item = (GnomeDAItem *) entry->data; -- -- model = gtk_combo_box_get_model (combo_box); -- -- if (item->icon_path && gtk_tree_model_get_iter_from_string (model, &iter, item->icon_path)) { -- pixbuf = gtk_icon_theme_load_icon (theme, item->icon_name, 22, 0, NULL); -- -- gtk_list_store_set (GTK_LIST_STORE (model), &iter, -- PIXBUF_COL, pixbuf, -- -1); -- -- if (pixbuf) -- g_object_unref (pixbuf); -- } -- } --} -- - static struct { - const gchar *name; - const gchar *icon; -@@ -246,13 +219,6 @@ - icon = gtk_builder_get_object (capplet->builder, icons[i].name); - set_icon (GTK_IMAGE (icon), theme, icons[i].icon); - } -- -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers); -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers); -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players); -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals); -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats); -- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats); - } - - static void -@@ -397,33 +363,31 @@ - } - - static void --fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list, gboolean add_custom) -+fill_combo_box (GtkComboBox *combo_box, GList *app_list, gboolean add_custom) - { - GList *entry; - GtkTreeModel *model; - GtkCellRenderer *renderer; - GtkTreeIter iter; -- GdkPixbuf *pixbuf; -- -- if (theme == NULL) { -- theme = gtk_icon_theme_get_default (); -- } - - if (add_custom) { - gtk_combo_box_set_row_separator_func (combo_box, is_separator, - GINT_TO_POINTER (g_list_length (app_list)), NULL); - } - -- model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING)); -+ model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_ICON, G_TYPE_STRING)); - gtk_combo_box_set_model (combo_box, model); - - renderer = gtk_cell_renderer_pixbuf_new (); - - /* not all cells have a pixbuf, this prevents the combo box to shrink */ -- gtk_cell_renderer_set_fixed_size (renderer, -1, 22); -+ gtk_cell_renderer_set_fixed_size (renderer, -1, 24); -+ g_object_set (G_OBJECT (renderer), -+ "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, -+ NULL); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, -- "pixbuf", PIXBUF_COL, -+ "gicon", ICON_COL, - NULL); - - renderer = gtk_cell_renderer_text_new (); -@@ -436,18 +400,11 @@ - GnomeDAItem *item; - item = (GnomeDAItem *) entry->data; - -- pixbuf = gtk_icon_theme_load_icon (theme, item->icon_name, 22, 0, NULL); -- - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, -- PIXBUF_COL, pixbuf, -+ ICON_COL, item->icon, - TEXT_COL, item->name, - -1); -- -- item->icon_path = gtk_tree_model_get_string_from_iter (model, &iter); -- -- if (pixbuf) -- g_object_unref (pixbuf); - } - - if (add_custom) { -@@ -455,7 +412,7 @@ - gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1); - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, -- PIXBUF_COL, NULL, -+ ICON_COL, NULL, - TEXT_COL, _("Custom"), - -1); - } -@@ -528,12 +485,12 @@ - g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet); - screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet); - -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); -- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); -+ fill_combo_box (GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); - - set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http"); - set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto"); -Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.c 2011-01-05 16:04:48.644316418 -0500 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c 2011-01-05 16:05:40.653854197 -0500 -@@ -79,8 +79,8 @@ - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); -- g_free (item->generic.icon_name); -- g_free (item->generic.icon_path); -+ if (item->generic.icon) -+ g_object_unref (item->generic.icon); - - g_object_unref (item->app_info); - -@@ -95,8 +95,8 @@ - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); -- g_free (item->generic.icon_name); -- g_free (item->generic.icon_path); -+ if (item->generic.icon) -+ g_object_unref (item->generic.icon); - - g_free (item); - } -@@ -109,8 +109,8 @@ - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); -- g_free (item->generic.icon_name); -- g_free (item->generic.icon_path); -+ if (item->generic.icon) -+ g_object_unref (item->generic.icon); - - g_free (item->exec_flag); - -@@ -125,8 +125,8 @@ - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); -- g_free (item->generic.icon_name); -- g_free (item->generic.icon_path); -+ if (item->generic.icon) -+ g_object_unref (item->generic.icon); - - g_free (item); - } -@@ -139,8 +139,8 @@ - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); -- g_free (item->generic.icon_name); -- g_free (item->generic.icon_path); -+ if (item->generic.icon) -+ g_object_unref (item->generic.icon); - - g_free (item); - } -Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.h 2011-01-05 16:04:48.684316062 -0500 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h 2011-01-05 16:05:40.653854197 -0500 -@@ -35,8 +35,7 @@ - gchar *name; - gchar *executable; - gchar *command; -- gchar *icon_name; -- gchar *icon_path; -+ GIcon *icon; - }; - - struct _GnomeDASimpleItem { -Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c -=================================================================== ---- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-xml.c 2011-01-05 16:04:48.624316596 -0500 -+++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c 2011-01-05 16:05:40.653854197 -0500 -@@ -152,7 +152,7 @@ - term_item->generic.name = gnome_da_xml_get_string (element, "name"); - term_item->generic.executable = executable; - term_item->generic.command = gnome_da_xml_get_string (element, "command"); -- term_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -+ term_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); - - term_item->exec_flag = gnome_da_xml_get_string (element, "exec-flag"); - -@@ -173,7 +173,7 @@ - media_item->generic.name = gnome_da_xml_get_string (element, "name"); - media_item->generic.executable = executable; - media_item->generic.command = gnome_da_xml_get_string (element, "command"); -- media_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -+ media_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); - - media_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); - -@@ -194,7 +194,7 @@ - visual_item->generic.name = gnome_da_xml_get_string (element, "name"); - visual_item->generic.executable = executable; - visual_item->generic.command = gnome_da_xml_get_string (element, "command"); -- visual_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -+ visual_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); - - visual_item->run_at_startup = gnome_da_xml_get_bool (element, "run-at-startup"); - -@@ -215,7 +215,7 @@ - mobility_item->generic.name = gnome_da_xml_get_string (element, "name"); - mobility_item->generic.executable = executable; - mobility_item->generic.command = gnome_da_xml_get_string (element, "command"); -- mobility_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); -+ mobility_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); - - mobility_item->run_at_startup = gnome_da_xml_get_bool (element, "run-at-startup"); - -@@ -246,12 +246,18 @@ - executable = g_app_info_get_executable (app_info); - if (is_executable_valid (executable)) { - GnomeDAURLItem *url_item; -+ GIcon *icon; - - url_item = gnome_da_url_item_new (); - url_item->generic.name = g_strdup (g_app_info_get_display_name (app_info)); - url_item->generic.executable = g_strdup (executable); - url_item->generic.command = g_strdup (g_app_info_get_commandline (app_info)); -- url_item->generic.icon_name = g_strdup (g_app_info_get_name (app_info)); -+ -+ icon = g_app_info_get_icon (app_info); -+ if (icon != NULL) { -+ url_item->generic.icon = g_object_ref (icon); -+ } -+ - /* Steal the reference */ - url_item->app_info = app_info; - diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch deleted file mode 100644 index 6662e0bd1242..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch +++ /dev/null @@ -1,383 +0,0 @@ -From a485992913ec84a4c558cad535dd8a2ab14b0c19 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Fri, 25 Apr 2014 22:17:24 +0200 -Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional - -Upstream is not interested in any part of this patch: - -https://bugzilla.gnome.org/show_bug.cgi?id=686840 -https://bugzilla.gnome.org/show_bug.cgi?id=697478 -https://bugzilla.gnome.org/show_bug.cgi?id=700145 - -Dropped mm from this revision of the patch since it appears more -complicated than ever to split it from the network panel. - -Signed-Off: Gilles Dartiguelongue ---- - configure.ac | 146 ++++++++++++++++++++++++++------ - panels/Makefile.am | 10 ++- - panels/user-accounts/um-realm-manager.c | 9 ++ - shell/Makefile.am | 10 ++- - shell/cc-panel-loader.c | 8 ++ - 5 files changed, 153 insertions(+), 30 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 511f78d..f82108e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -139,14 +139,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) - PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) - PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0) --PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -+ -+build_online_accounts=false -+AC_ARG_ENABLE(goa, -+ AC_HELP_STRING([--disable-goa], -+ [disable online accounts management panel]), -+ [case "${enableval}" in -+ yes) WANT_ONLINE_ACCOUNTS=yes ;; -+ no) WANT_ONLINE_ACCOUNTS=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; -+ esac], -+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value -+ -+if test x$WANT_ONLINE_ACCOUNTS = xyes; then -+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -+ build_online_accounts=true -+fi -+if test "x$build_online_accounts" = xtrue ; then -+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) -+fi -+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) -+ - PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION) --PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES -- colord >= $COLORD_REQUIRED_VERSION -- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION -- libsoup-2.4 -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ -+build_color=false -+AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [disable color management panel]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=yes ;; -+ no) WANT_COLOR=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=yes]) dnl Default value -+ -+if test x$WANT_COLOR = xyes; then -+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES -+ colord >= $COLORD_REQUIRED_VERSION -+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION -+ libsoup-2.4 -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ build_color=true -+fi -+if test "x$build_color" = xtrue ; then -+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) -+fi -+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") -+AC_SUBST(COLOR_PANEL_CFLAGS) -+AC_SUBST(COLOR_PANEL_LIBS) -+ - PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) -@@ -206,8 +250,25 @@ fi - AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) - - # Check for gnome-bluetooth --PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1, -- [have_bluetooth=yes], have_bluetooth=no) -+have_bluetooth=no -+AC_ARG_ENABLE(bluetooth, -+ AC_HELP_STRING([--disable-bluetooth], -+ [disable bluetooth management panel]), -+ [case "${enableval}" in -+ yes) WANT_BLUETOOTH=yes ;; -+ no) WANT_BLUETOOTH=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; -+ esac], -+ [WANT_BLUETOOTH=yes]) dnl Default value -+ -+if test x$WANT_BLUETOOTH = xyes; then -+ # Check for gnome-bluetooth -+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1, -+ [have_bluetooth=yes], have_bluetooth=no) -+ have_bluetooth=yes -+fi -+ -+ - if test "x$have_bluetooth" = xyes ; then - AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) - fi -@@ -292,15 +353,27 @@ case $host_os in - if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then - have_wacom=no - else -- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -- gnome-settings-daemon >= $GSD_REQUIRED_VERSION -- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION -- clutter-gtk-1.0 -- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) -- have_wacom=yes -- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) -- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) -+ AC_ARG_ENABLE(wacom, -+ AC_HELP_STRING([--disable-wacom], -+ [disable wacom management panel]), -+ [case "${enableval}" in -+ yes) WANT_WACOM=yes ;; -+ no) WANT_WACOM=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; -+ esac], -+ [WANT_WACOM=yes]) dnl Default value -+ -+ if test x$WANT_WACOM = xyes; then -+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION -+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION -+ clutter-gtk-1.0 -+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) -+ have_wacom=yes -+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) -+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) -+ fi - fi - ;; - *) -@@ -310,16 +383,22 @@ esac - AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) - - # Kerberos kerberos support --AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) --if test "$KRB5_CONFIG" = "no"; then -- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) --fi -- --AC_MSG_CHECKING(for krb5 libraries and flags) --KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" --KRB5_LIBS="`$KRB5_CONFIG --libs`" --AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) -+AC_ARG_ENABLE([kerberos], -+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, -+ [enable_kerberos=yes]) -+ -+if test x"$enable_kerberos" != x"no" ; then -+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) -+ if test "$KRB5_CONFIG" = "no"; then -+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) -+ fi - -+ AC_MSG_CHECKING(for krb5 libraries and flags) -+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" -+ KRB5_LIBS="`$KRB5_CONFIG --libs`" -+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) -+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) -+fi - AC_SUBST(KRB5_CFLAGS) - AC_SUBST(KRB5_LIBS) - -@@ -538,6 +617,11 @@ if test "x$have_bluetooth" = "xyes"; then - else - AC_MSG_NOTICE([ Bluetooth panel disabled]) - fi -+if test "x$build_color" = "xtrue"; then -+ AC_MSG_NOTICE([** colord (Color panel)]) -+else -+ AC_MSG_NOTICE([ Color panel disabled]) -+fi - if test "x$enable_cups" = "xyes"; then - AC_MSG_NOTICE([** CUPS (Printers panel)]) - else -@@ -548,6 +632,16 @@ if test "x$have_cheese" = "xyes"; then - else - AC_MSG_NOTICE([ Users panel webcam support disabled]) - fi -+if test "x$build_online_accounts" = "xtrue"; then -+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) -+else -+ AC_MSG_NOTICE([ Online Accounts panel disabled]) -+fi -+if test "x$build_wacom" = "xtrue"; then -+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) -+else -+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) -+fi - if test "x$have_wacom" = "xyes"; then - AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) - else -diff --git a/panels/Makefile.am b/panels/Makefile.am -index 9961c25..0c54622 100644 ---- a/panels/Makefile.am -+++ b/panels/Makefile.am -@@ -2,11 +2,9 @@ SUBDIRS= \ - common \ - background \ - power \ -- color \ - display \ - mouse \ - notifications \ -- online-accounts \ - region \ - info \ - sound \ -@@ -18,6 +16,10 @@ SUBDIRS= \ - privacy \ - sharing - -+if BUILD_COLOR -+SUBDIRS += color -+endif -+ - if BUILD_WACOM - SUBDIRS += wacom - endif -@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH - SUBDIRS += bluetooth - endif - -+if BUILD_ONLINE_ACCOUNTS -+SUBDIRS += online-accounts -+endif -+ - -include $(top_srcdir)/git.mk -diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c -index 0849160..58d50a6 100644 ---- a/panels/user-accounts/um-realm-manager.c -+++ b/panels/user-accounts/um-realm-manager.c -@@ -22,7 +22,9 @@ - - #include "um-realm-manager.h" - -+#ifdef HAVE_KERBEROS - #include -+#endif - - #include - #include -@@ -696,6 +698,7 @@ login_closure_free (gpointer data) - g_slice_free (LoginClosure, login); - } - -+#ifdef HAVE_KERBEROS - static krb5_error_code - login_perform_kinit (krb5_context k5, - const gchar *realm, -@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5, - - return code; - } -+#endif /* HAVE_KERBEROS */ - - static void - kinit_thread_func (GSimpleAsyncResult *async, - GObject *object, - GCancellable *cancellable) - { -+#ifdef HAVE_KERBEROS - LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); - krb5_context k5 = NULL; - krb5_error_code code; -@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async, - - if (k5) - krb5_free_context (k5); -+#else /* HAVE_KERBEROS */ -+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, -+ _("gnome-control-center was built without kerberos support")); -+#endif - } - - void -diff --git a/shell/Makefile.am b/shell/Makefile.am -index ad7a68f..cc968ac 100644 ---- a/shell/Makefile.am -+++ b/shell/Makefile.am -@@ -52,14 +52,12 @@ gnome_control_center_LDADD = \ - $(top_builddir)/libgd/libgd.la \ - $(top_builddir)/panels/common/liblanguage.la \ - $(top_builddir)/panels/background/libbackground.la \ -- $(top_builddir)/panels/color/libcolor.la \ - $(top_builddir)/panels/datetime/libdate_time.la \ - $(top_builddir)/panels/display/libdisplay.la \ - $(top_builddir)/panels/info/libinfo.la \ - $(top_builddir)/panels/keyboard/libkeyboard.la \ - $(top_builddir)/panels/mouse/libmouse-properties.la \ - $(top_builddir)/panels/notifications/libnotifications.la \ -- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ - $(top_builddir)/panels/power/libpower.la \ - $(top_builddir)/panels/privacy/libprivacy.la \ - $(top_builddir)/panels/region/libregion.la \ -@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH - gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la - endif - -+if BUILD_COLOR -+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la -+endif -+ -+if BUILD_ONLINE_ACCOUNTS -+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la -+endif -+ - AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\"" - - # Dbus service file -diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 26576dc..8a92f95 100644 ---- a/shell/cc-panel-loader.c -+++ b/shell/cc-panel-loader.c -@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); - #ifdef BUILD_BLUETOOTH - extern GType cc_bluetooth_panel_get_type (void); - #endif /* BUILD_BLUETOOTH */ -+#ifdef BUILD_COLOR - extern GType cc_color_panel_get_type (void); -+#endif /* BUILD_COLOR */ - extern GType cc_date_time_panel_get_type (void); - extern GType cc_display_panel_get_type (void); - extern GType cc_info_panel_get_type (void); -@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); - extern GType cc_network_panel_get_type (void); - #endif /* BUILD_NETWORK */ - extern GType cc_notifications_panel_get_type (void); -+#ifdef BUILD_ONLINE_ACCOUNTS - extern GType cc_goa_panel_get_type (void); -+#endif /* BUILD_ONLINE_ACCOUNTS */ - extern GType cc_power_panel_get_type (void); - #ifdef BUILD_PRINTERS - extern GType cc_printers_panel_get_type (void); -@@ -77,7 +81,9 @@ static struct { - #ifdef BUILD_BLUETOOTH - PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), - #endif -+#ifdef BUILD_COLOR - PANEL_TYPE("color", cc_color_panel_get_type ), -+#endif - PANEL_TYPE("datetime", cc_date_time_panel_get_type ), - PANEL_TYPE("display", cc_display_panel_get_type ), - PANEL_TYPE("info", cc_info_panel_get_type ), -@@ -87,7 +93,9 @@ static struct { - PANEL_TYPE("network", cc_network_panel_get_type ), - #endif - PANEL_TYPE("notifications", cc_notifications_panel_get_type), -+#ifdef BUILD_ONLINE_ACCOUNTS - PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), -+#endif - PANEL_TYPE("power", cc_power_panel_get_type ), - #ifdef BUILD_PRINTERS - PANEL_TYPE("printers", cc_printers_panel_get_type ), --- -1.9.0 - diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild deleted file mode 100644 index 94a3c94d072b..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.32.1-r1.ebuild,v 1.9 2014/01/05 07:39:55 tetromino Exp $ - -EAPI="3" -GCONF_DEBUG="yes" - -inherit autotools gnome2 eutils - -DESCRIPTION="The gnome2 Desktop configuration tool" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="eds" - -# TODO: appindicator -# libgnomekbd-2.91 breaks API/ABI -RDEPEND="x11-libs/libXft - >=x11-libs/libXi-1.2 - >=x11-libs/gtk+-2.20:2 - >=dev-libs/glib-2.28:2 - >=gnome-base/gconf-2.0:2 - >=gnome-base/librsvg-2.0:2 - >=gnome-base/nautilus-2.6 - >=media-libs/fontconfig-1 - >=dev-libs/dbus-glib-0.73 - >=x11-libs/libxklavier-4.0 - >=x11-wm/metacity-2.23.1 - >=gnome-base/libgnomekbd-2.31.2 - =gnome-base/gnome-desktop-2.29.4:2 - >=gnome-base/gnome-menus-2.11.1:0 - gnome-base/gnome-settings-daemon - - dev-libs/libunique:1 - x11-libs/pango - dev-libs/libxml2 - media-libs/freetype - media-libs/libcanberra[gtk] - - eds? ( >=gnome-extra/evolution-data-server-1.7.90 ) - - x11-apps/xmodmap - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXxf86misc - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXcursor" -DEPEND="${RDEPEND} - x11-proto/scrnsaverproto - x11-proto/xextproto - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - x11-proto/randrproto - x11-proto/renderproto - - sys-devel/gettext - >=dev-util/intltool-0.40 - virtual/pkgconfig - dev-util/desktop-file-utils - - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.10.1" -# Needed for autoreconf -# gnome-base/gnome-common - -pkg_setup() { - G2CONF="${G2CONF} - --disable-update-mimedb - --disable-static - --disable-appindicator - $(use_enable eds aboutme)" - DOCS="AUTHORS ChangeLog NEWS README TODO" -} - -src_prepare() { - # Use URL handlers for browser and mailer applications - epatch "${FILESDIR}/${P}-mime-handler.patch" - - # When starting up, read current web and mail values - epatch "${FILESDIR}/${P}-mime-handler2.patch" - - # Fix icons for new glib url handlers - epatch "${FILESDIR}/${P}-mime-handler3.patch" - - # Do not show twice the configured background if it is a symlink to a known background - epatch "${FILESDIR}/${P}-duplicated-background.patch" - - # Don't erase backgounds.xml, bug #344335 - epatch "${FILESDIR}/${P}-erase-background.patch" - - # Fix underlinking failure, bug #497112 - epatch "${FILESDIR}/${P}-gmodule.patch" - - rm missing || die # old missing script causes autoreconf warnings - eautoreconf - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - # gmodule is used to load plugins - # (on POSIX systems gmodule uses dlopen) - prune_libtool_files --modules -} diff --git a/gnome-base/gnome-fallback/Manifest b/gnome-base/gnome-fallback/Manifest deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/gnome-base/gnome-fallback/gnome-fallback-3.6.2.ebuild b/gnome-base/gnome-fallback/gnome-fallback-3.6.2.ebuild deleted file mode 100644 index 6830ee48719d..000000000000 --- a/gnome-base/gnome-fallback/gnome-fallback-3.6.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-fallback/gnome-fallback-3.6.2.ebuild,v 1.5 2013/02/02 22:35:08 ago Exp $ - -EAPI="5" - -DESCRIPTION="Sub-meta package for GNOME 3 fallback mode" -HOMEPAGE="http://www.gnome.org/" -LICENSE="metapackage" -SLOT="3.0" -IUSE="cups" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# Note to developers: -# This is a wrapper for the GNOME 3 fallback apps list -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV}[cups?] - - >=x11-wm/metacity-2.34.13 - >=x11-misc/notification-daemon-0.7.6 - >=gnome-extra/polkit-gnome-0.105 - >=gnome-base/gnome-panel-${PV} -" -DEPEND="" - -S="${WORKDIR}" diff --git a/gnome-base/gnome-fallback/gnome-fallback-3.8.0.ebuild b/gnome-base/gnome-fallback/gnome-fallback-3.8.0.ebuild deleted file mode 100644 index ef6c2b86698b..000000000000 --- a/gnome-base/gnome-fallback/gnome-fallback-3.8.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-fallback/gnome-fallback-3.8.0.ebuild,v 1.4 2013/12/08 18:30:05 pacho Exp $ - -EAPI="5" - -DESCRIPTION="Sub-meta package for GNOME 3 fallback mode" -HOMEPAGE="https://wiki.gnome.org/GnomeFlashback" -LICENSE="metapackage" -SLOT="3.0" -IUSE="cups" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -# Note to developers: -# This is a wrapper for the GNOME 3 fallback apps list -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV}[cups?] - - >=x11-wm/metacity-2.34.13 - >=x11-misc/notification-daemon-0.7.6 - >=gnome-base/nautilus-${PV} - >=gnome-extra/gnome-screensaver-3.6.1 - >=gnome-extra/polkit-gnome-0.105 - >=gnome-base/gnome-panel-${PV} -" -DEPEND="" - -S="${WORKDIR}" diff --git a/gnome-base/gnome-fallback/metadata.xml b/gnome-base/gnome-fallback/metadata.xml deleted file mode 100644 index da6fd63d0085..000000000000 --- a/gnome-base/gnome-fallback/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -gnome - diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest index 2341051e161f..3054fe78ec91 100644 --- a/gnome-base/gnome-keyring/Manifest +++ b/gnome-base/gnome-keyring/Manifest @@ -1,4 +1 @@ -DIST gnome-keyring-2.32.1.tar.bz2 1619245 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9 SHA512 23b91bc11be2805df228de98513a5f96386a89d6ead6434b7fdf4a3bee86b6601bb994b9de4524f8751c7d7f1ac9462c592bcd9b77c32234fc709148450e382b WHIRLPOOL fa9ed1d79a8af912ca8c4957d6dba30322a0239dd2c9b40f5c6adbfc66147402870a6400ae8bbdb56380c250e095b601ab9689f65ea17c95a76e7e2defe27c7d -DIST gnome-keyring-3.10.1.tar.xz 1141960 SHA256 18001fa94c6d92e476b76423fe585dbf649051bba33012a037b07449c215dbf8 SHA512 ed37e64aed6963ee97894df58e380af2efa4995515891f36bce9aadeea29eef8b25d28d1b30adc0a3e912eb9ddf7662de92dc7b4962ed5aeaacaa7b60dd5b39b WHIRLPOOL 4e025fa3a3f9744ffb377e5dda40c3c194f3f4929805f530b59638d4750eb49f1975311b25b97b980d41305fa5062c11866924dd5d2bb711e9b0b03e64097c06 -DIST gnome-keyring-3.12.0.tar.xz 1162892 SHA256 92695ed4d78a576ae77a9ac6faa8fe59db14358ec46b073199e70d537e29ec5f SHA512 2eeb19b9a9361dfae3627f2e292d7b23f298bc7c77b9c1bcd275baf2ff91ac002bf9897d3ef6d9ebe3e343f31be4813b00c014b2659b2f16748ba3b87ee57938 WHIRLPOOL 71e67ab2802bbe3ef32b6edebf9a075d265130510e21b05485ad3ff556bb2e3698962c95e32d34d2bf3768ed9b5f2af0ef8ad2e8c15c7209be7097efa314f6f6 DIST gnome-keyring-3.12.2.tar.xz 1170560 SHA256 3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c SHA512 e8e095904e63f589cdc30818ecab7938e42750054880f1fc01dfbb39375ae56a4497158309717b726594e54ad2604eaeedd8a8ed73697b4c348185f32af17457 WHIRLPOOL cb5b0dcff8d5d5d1e7633f835f242cad2c1f4a383717dd75fdf5e5d9e22c8e0b4966a50e2cb34c5fff39d50a42a92b7647335263677dd277bbf9fbfeccb7ca16 diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-fix-undefined.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-fix-undefined.patch deleted file mode 100644 index 28103ba5d594..000000000000 --- a/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-fix-undefined.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4050d583e8fe6c5c4bb71f0fd4ba6498cdf5a1b6 Mon Sep 17 00:00:00 2001 -From: Ryan Stonecipher -Date: Mon, 24 Jan 2011 20:42:02 +0000 -Subject: Fix undefined type in egg-asn1x.c - -Mac OSX doesn't have a ulong type - -https://bugzilla.gnome.org/show_bug.cgi?id=640362 ---- -diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c -index 122cedf..10bd92c 100644 ---- a/egg/egg-asn1x.c -+++ b/egg/egg-asn1x.c -@@ -2064,8 +2064,8 @@ anode_write_integer_ulong (gulong value, guchar *data, gsize *n_data) - guchar buf[sizeof (gulong)]; - gint bytes, i, off; - -- for (i = 0; i < sizeof (ulong); ++i) { -- off = sizeof (ulong) - (i + 1); -+ for (i = 0; i < sizeof (gulong); ++i) { -+ off = sizeof (gulong) - (i + 1); - buf[i] = (value >> (off * 8)) & 0xFF; - } - --- -cgit v0.9 diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-glib-2.32.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-glib-2.32.patch deleted file mode 100644 index ab63d5fa3d3a..000000000000 --- a/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-glib-2.32.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 002a073fe2b403ae7d006372e690743b664236d3 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Wed, 24 Oct 2012 02:52:28 -0400 -Subject: [PATCH] Explicitly link to gmodule - -Fixes build failure with glib-2.32 and gold. ---- - configure.in | 4 ++++ - gp11/Makefile.am | 4 +++- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index f781384..cdf9a2e 100644 ---- a/configure.in -+++ b/configure.in -@@ -70,6 +70,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0) - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - -+PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0) -+AC_SUBST(GMODULE_CFLAGS) -+AC_SUBST(GMODULE_LIBS) -+ - PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.8.0) - AC_SUBST(GTHREAD_CFLAGS) - AC_SUBST(GTHREAD_LIBS) -diff --git a/gp11/Makefile.am b/gp11/Makefile.am -index 18942bd..5a90404 100644 ---- a/gp11/Makefile.am -+++ b/gp11/Makefile.am -@@ -8,6 +8,7 @@ INCLUDES = \ - -I$(top_srcdir) \ - $(GOBJECT_CFLAGS) \ - $(GTHREAD_CFLAGS) \ -+ $(GMODULE_CFLAGS) \ - $(GLIB_CFLAGS) - - BUILT_SOURCES = \ -@@ -34,6 +35,7 @@ libgp11_la_LIBADD = \ - $(GOBJECT_LIBS) \ - $(GTHREAD_LIBS) \ - $(GIO_LIBS) \ -+ $(GMODULE_LIBS) \ - $(GLIB_LIBS) - - gp11-marshal.h: gp11-marshal.list $(GLIB_GENMARSHAL) -@@ -64,4 +66,4 @@ endif - - SUBDIRS = . \ - $(TESTS_DIR) -- -\ No newline at end of file -+ --- -1.7.12.4 - diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild deleted file mode 100644 index 8565e60cb83e..000000000000 --- a/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild,v 1.11 2014/03/01 22:29:51 mgorny Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools eutils gnome2 multilib pam virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="http://live.gnome.org/GnomeKeyring" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="debug pam test" -# USE=valgrind is probably not a good idea for the tree - -RDEPEND=">=dev-libs/glib-2.25:2 - >=x11-libs/gtk+-2.20:2 - gnome-base/gconf:2 - >=sys-apps/dbus-1.0 - pam? ( virtual/pam ) - >=dev-libs/libgcrypt-1.2.2:0 - >=dev-libs/libtasn1-1" -# valgrind? ( dev-util/valgrind )" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.9 - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig" -PDEPEND="gnome-base/libgnome-keyring" - -# tests fail in several ways, they should be fixed in the next cycle (bug #340283), -# revisit then. -RESTRICT="test" - -src_prepare() { - DOCS="AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} - $(use_enable debug) - $(use_enable test tests) - $(use_enable pam) - $(use_with pam pam-dir $(getpam_mod_dir)) - --with-root-certs=${EPREFIX}/usr/share/ca-certificates/ - --enable-acl-prompts - --enable-ssh-agent - --enable-gpg-agent - --with-gtk=2.0" -# $(use_enable valgrind) - - epatch "${FILESDIR}/${P}-glib-2.32.patch" - eautoreconf - - gnome2_src_prepare - - # Remove silly CFLAGS - sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \ - -i configure.in configure || die "sed failed" - - # Remove DISABLE_DEPRECATED flags - sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \ - -i configure.in configure || die "sed 2 failed" - - # Fix undefined type in egg-asn1x.c - epatch "${FILESDIR}/${PN}-2.32.1-fix-undefined.patch" -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - Xemake check || die "emake check failed!" -} diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild deleted file mode 100644 index d57fa58e5028..000000000000 --- a/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild,v 1.13 2014/06/23 04:06:56 tetromino Exp $ - -EAPI="5" -GCONF_DEBUG="yes" # Not gnome macro but similar -GNOME2_LA_PUNT="yes" - -inherit fcaps gnome2 pam versionator virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="http://live.gnome.org/GnomeKeyring" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+caps debug pam selinux" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=" - >=app-crypt/gcr-3.5.3:=[gtk] - >=dev-libs/glib-2.32.0:2 - app-misc/ca-certificates - >=dev-libs/libgcrypt-1.2.2:0= - >=sys-apps/dbus-1.1.1 - caps? ( sys-libs/libcap-ng ) - pam? ( virtual/pam ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - # Disable stupid CFLAGS - sed -e 's/CFLAGS="$CFLAGS -g"//' \ - -e 's/CFLAGS="$CFLAGS -O0"//' \ - -i configure.ac configure || die - - # FIXME: some tests write to /tmp (instead of TMPDIR) - # Disable failing tests - sed -e '/g_test_add.*test_remove_file_abort/d' \ - -e '/g_test_add.*test_write_file/d' \ - -e '/g_test_add.*write_large_file/,+2 c\ {}; \ ' \ - -e '/g_test_add.*test_write_file_abort_.*/d' \ - -e '/g_test_add.*test_unique_file_conflict.*/d' \ - -i pkcs11/gkm/tests/test-transaction.c || die - sed -e '/g_test_add.*test_create_assertion_complete_on_token/d' \ - -i pkcs11/xdg-store/tests/test-xdg-trust.c || die - sed -e '/g_test_add.*gnome2-store.import.pkcs12/,+1 d' \ - -i pkcs11/gnome2-store/tests/test-import.c || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_with caps libcap-ng) \ - $(use_enable pam) \ - $(use_with pam pam-dir $(getpam_mod_dir)) \ - $(use_enable selinux) \ - --enable-doc \ - --enable-ssh-agent \ - --enable-gpg-agent -} - -src_test() { - # FIXME: this should be handled at eclass level - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die - - unset DBUS_SESSION_BUS_ADDRESS - GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check -} - -pkg_postinst() { - fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon - gnome2_pkg_postinst -} diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild deleted file mode 100644 index 9232fe2d4fe6..000000000000 --- a/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild,v 1.2 2014/06/23 04:06:56 tetromino Exp $ - -EAPI="5" -GCONF_DEBUG="yes" # Not gnome macro but similar -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit fcaps gnome2 pam python-any-r1 versionator virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="http://live.gnome.org/GnomeKeyring" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+caps debug pam selinux" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=" - >=app-crypt/gcr-3.5.3:=[gtk] - >=dev-libs/glib-2.38:2 - app-misc/ca-certificates - >=dev-libs/libgcrypt-1.2.2:0= - >=sys-apps/dbus-1.1.1 - caps? ( sys-libs/libcap-ng ) - pam? ( virtual/pam ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig -" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - # Disable stupid CFLAGS - sed -e 's/CFLAGS="$CFLAGS -g"//' \ - -e 's/CFLAGS="$CFLAGS -O0"//' \ - -i configure.ac configure || die - - # FIXME: some tests write to /tmp (instead of TMPDIR) - # Disable failing tests - sed -e 's|\(g_test_add.*/gkm/data-asn1/integers.*;\)|/*\1*/|' \ - -i "${S}"/pkcs11/gkm/test-data-asn1.c || die - sed -e 's|\(g_test_add.*/gkm/timer/cancel.*;\)|/*\1*/|' \ - -i "${S}"/pkcs11/gkm/test-timer.c || die - # For some reason all pam tests make the testsuite retun 77 - # which is considered an error but the test framework, - # but all tests are successful - # FIXME: this is only for overlay, report upstream, make a patch !!! - sed -e '558,595 d' -i "${S}"/pam/test-pam.c || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_with caps libcap-ng) \ - $(use_enable pam) \ - $(use_with pam pam-dir $(getpam_mod_dir)) \ - $(use_enable selinux) \ - --enable-doc \ - --enable-ssh-agent \ - --enable-gpg-agent -} - -src_test() { - # FIXME: this should be handled at eclass level - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die - - unset DBUS_SESSION_BUS_ADDRESS - GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check -} - -pkg_postinst() { - fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon - gnome2_pkg_postinst -} diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild deleted file mode 100644 index 96e3d30b8200..000000000000 --- a/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild,v 1.3 2014/06/23 04:06:56 tetromino Exp $ - -EAPI="5" -GCONF_DEBUG="yes" # Not gnome macro but similar -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit fcaps gnome2 pam python-any-r1 versionator virtualx - -DESCRIPTION="Password and keyring managing daemon" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+caps debug pam selinux +ssh-agent" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=" - >=app-crypt/gcr-3.5.3:=[gtk] - >=dev-libs/glib-2.38:2 - app-misc/ca-certificates - >=dev-libs/libgcrypt-1.2.2:0= - >=sys-apps/dbus-1.1.1 - caps? ( sys-libs/libcap-ng ) - pam? ( virtual/pam ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig -" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - # Disable stupid CFLAGS - sed -e 's/CFLAGS="$CFLAGS -g"//' \ - -e 's/CFLAGS="$CFLAGS -O0"//' \ - -i configure.ac configure || die - - # FIXME: some tests write to /tmp (instead of TMPDIR) - # Disable failing tests - sed -e 's|\(g_test_add.*/gkm/data-asn1/integers.*;\)|/*\1*/|' \ - -i "${S}"/pkcs11/gkm/test-data-asn1.c || die - sed -e 's|\(g_test_add.*/gkm/timer/cancel.*;\)|/*\1*/|' \ - -i "${S}"/pkcs11/gkm/test-timer.c || die - # For some reason all pam tests make the testsuite retun 77 - # which is considered an error but the test framework, - # but all tests are successful, upstream bug #731030 - sed -e '558,595 d' -i "${S}"/pam/test-pam.c || die - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - $(use_with caps libcap-ng) \ - $(use_enable pam) \ - $(use_with pam pam-dir $(getpam_mod_dir)) \ - $(use_enable selinux) \ - $(use_enable ssh-agent) \ - --enable-doc \ - --enable-gpg-agent -} - -src_test() { - # FIXME: this should be handled at eclass level - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die - - unset DBUS_SESSION_BUS_ADDRESS - GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check -} - -pkg_postinst() { - fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon - gnome2_pkg_postinst -} diff --git a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild deleted file mode 100644 index e5b7e61d7874..000000000000 --- a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild +++ /dev/null @@ -1,86 +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-light/gnome-light-2.32.1-r2.ebuild,v 1.10 2012/11/05 21:38:52 ulm Exp $ - -EAPI="4" - -S=${WORKDIR} -DESCRIPTION="Meta package for the GNOME desktop, merge this package to install" -HOMEPAGE="http://www.gnome.org/" -LICENSE="metapackage" -SLOT="2.0" -IUSE="+automount" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" - -# Note to developers: -# This is a wrapper for the 'light' Gnome2 desktop, -# This should only consist of the bare minimum of libs/apps needed -# It is basicly the gnome-base/gnome without all extra apps - -# This is currently in it's test phase, if you feel like some dep -# should be added or removed from this pack file a bug to -# gnome@gentoo.org on bugs.gentoo.org - -# >=media-gfx/eog-2.30.2 - -RDEPEND="!=dev-libs/glib-2.26.1:2 - >=x11-libs/gtk+-2.22.1-r1:2 - >=x11-libs/gdk-pixbuf-2.22.1:2 - >=dev-libs/atk-1.32.0 - >=x11-libs/pango-1.28.3 - - >=gnome-base/orbit-2.14.19:2 - - >=x11-libs/libwnck-2.30.6:1 - >=x11-wm/metacity-2.30.3 - - >=gnome-base/gconf-2.32.0-r1:2 - >=gnome-base/dconf-0.5.1-r2 - - >=gnome-base/libbonobo-2.24.3 - >=gnome-base/libbonoboui-2.24.4 - >=gnome-base/libgnome-2.32.0 - >=gnome-base/libgnomecanvas-2.30.2 - >=gnome-base/libglade-2.6.4:2.0 - - >=gnome-base/gnome-settings-daemon-2.32.1 - >=gnome-base/gnome-control-center-2.32.0 - - >=gnome-base/nautilus-2.32.1 - - >=gnome-base/gnome-desktop-2.32.1:2 - >=gnome-base/gnome-session-2.32.1 - >=gnome-base/gnome-panel-2.32.1 - - >=x11-themes/gnome-icon-theme-2.31.0 - >=x11-themes/gnome-themes-2.32.1-r1 - >=x11-themes/gnome-themes-standard-3.0.2 - - >=x11-terms/gnome-terminal-2.32.1 - - >=gnome-base/librsvg-2.32.1:2 - - >=gnome-extra/yelp-2.30.2" -DEPEND="" -PDEPEND=">=gnome-base/gvfs-1.6.6 - automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )" - -pkg_postinst () { -# FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway -# FIXME: but first check WINDOW_MANAGER is still honored in 2.24. gnome-session-2.24 might have lost -# FIXME: support for it, but we don't ship with gnome-session-2.24 yet -# elog "Note that to change windowmanager to metacity do: " -# elog " export WINDOW_MANAGER=\"/usr/bin/metacity\"" -# elog "of course this works for all other window managers as well" -# elog - - elog - elog "Use gnome-base/gnome for the full GNOME Desktop" - elog "as released by the GNOME team." -} diff --git a/gnome-base/gnome-light/gnome-light-3.10.0.ebuild b/gnome-base/gnome-light/gnome-light-3.10.0.ebuild deleted file mode 100644 index 0b85c5f30c3f..000000000000 --- a/gnome-base/gnome-light/gnome-light-3.10.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.10.0.ebuild,v 1.3 2014/03/09 11:58:38 pacho Exp $ - -EAPI="5" - -DESCRIPTION="Meta package for GNOME-Light, merge this package to install" -HOMEPAGE="http://www.gnome.org/" -LICENSE="metapackage" -SLOT="2.0" -IUSE="cups +gnome-shell" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -# XXX: Note to developers: -# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of -# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without -# any apps, but shouldn't be used by users unless they know what they are doing. -RDEPEND="!gnome-base/gnome - >=gnome-base/gnome-core-libs-${PV}[cups?] - - >=gnome-base/gnome-session-${PV} - >=gnome-base/gnome-menus-${PV}:3 - >=gnome-base/gnome-settings-daemon-${PV}[cups?] - >=gnome-base/gnome-control-center-${PV}[cups?] - - >=gnome-base/nautilus-${PV} - - gnome-shell? ( - >=x11-wm/mutter-${PV} - >=gnome-base/gnome-shell-${PV} ) - - >=x11-themes/gnome-icon-theme-${PV} - >=x11-themes/gnome-icon-theme-symbolic-${PV} - >=x11-themes/gnome-themes-standard-${PV} - - >=x11-terms/gnome-terminal-${PV} -" -DEPEND="" -PDEPEND=">=gnome-base/gvfs-1.18.0" -S="${WORKDIR}" - -pkg_pretend() { - if ! use gnome-shell; then - # Users probably want to use e16, sawfish, etc - ewarn "You're installing neither GNOME Shell" - ewarn "You will have to install and manage a window manager by yourself" - fi -} diff --git a/gnome-base/gnome-light/metadata.xml b/gnome-base/gnome-light/metadata.xml index 917c1a91fe39..bda1c5424569 100644 --- a/gnome-base/gnome-light/metadata.xml +++ b/gnome-base/gnome-light/metadata.xml @@ -3,8 +3,6 @@ gnome - Use gnome-base/gvfs[gdu] for automounting - of drives in nautilus Install gnome-base/gnome-shell and x11-wm/mutter for the standard GNOME 3 desktop mode diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest index 7bc875505696..168ba2c240d2 100644 --- a/gnome-base/gnome-menus/Manifest +++ b/gnome-base/gnome-menus/Manifest @@ -1,4 +1,2 @@ -DIST gnome-menus-2.30.5.tar.bz2 471327 SHA256 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa SHA512 e2722f8fc11d99b58de601171e10f87efd64e8752c26d3e2126ff909a4c263cd8be4842d3592b1029396fecf832aa094630fec2e47ea711a363cd03de2980a22 WHIRLPOOL e0d350971ecb541757ce2282e67010d29807eda61fb79be10e132fddd654529030991648d102cda43c15d0148cafc1627a814aff0b6292f947717e16f697a1bf -DIST gnome-menus-3.0.1.tar.bz2 474839 SHA256 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0 SHA512 05eda56b741d7236b17276b3b208b8370ec8ff0db82e32a2c0adb84334c4d9365fe61dea08183858fb7c0093cf04a02ba1311483e3318dbe816a02c28f4198eb WHIRLPOOL f2583e79ea6aef0c5cffb94001ceba166b97e237861b51d39530155f36720bcfabbf50af0a16735f8112e44a7b8d7243ae9460285f590a0c2a351ad2203dc85e DIST gnome-menus-3.10.1-patches.tar.xz 5708 SHA256 fd97cd902aac72ca8aa783c65ae1664842bcf2227262848662e93e1c44e9f6ac SHA512 bfdca2ba70525b71059262d4d19a2567c3d74c7f255ff823e5c24e631b764ab05be954ec16630729220a22f2425f8d2a8ecb1b22641346f53d5af9d9f90feebc WHIRLPOOL 01942eb7cf017ffa42d1c4189320ec7be9a8e25127074151b0a929b22f8d66b43a257f7c96506cdcf28aee35ffdf009f4f20f30ac38faa0aee59b99149618a8e DIST gnome-menus-3.10.1.tar.xz 423052 SHA256 46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71 SHA512 e6f0fe223e60f6c33a2ed2cd958035e5560d4063fbe7485263c4ad0eba82e18948d19f7dbe84dd0db5c339e94366759a0f98da533e2798c3ed9cc9a87f73c7e0 WHIRLPOOL f4d4266c7d3d06a4551b3a4aaa987c5e3d8ecf867afa5ea6c7c41de4675d4973e2a87dd80a604acfbcc29f14c0f1e70156faa93d13429f33218bf5e790eee1d0 diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome b/gnome-base/gnome-menus/files/10-xdg-menu-gnome deleted file mode 100644 index b12a712eb45f..000000000000 --- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "gnome" ] -then - export XDG_MENU_PREFIX=gnome- -fi 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 4bbf86381083..000000000000 --- 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-2.18.3-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch deleted file mode 100644 index 895f5f2ca525..000000000000 --- a/gnome-base/gnome-menus/files/gnome-menus-2.18.3-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 @@ - Core - Settings - Screensaver -+ X-KDE-settings-accessibility -+ X-KDE-settings-components -+ X-KDE-settings-desktop -+ X-KDE-settings-looknfeel -+ X-KDE-settings-network -+ X-KDE-settings-webbrowsing -+ X-KDE-settings-peripherals -+ X-KDE-settings-hardware -+ X-KDE-settings-power -+ X-KDE-settings-security -+ X-KDE-settings-sound -+ X-KDE-settings-system -+ X-KDE-information - - - 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 5f5f8b2703e6..000000000000 --- 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 @@ - Core - Screensaver - X-GNOME-Settings-Panel -+ X-KDE-settings-accessibility -+ X-KDE-settings-components -+ X-KDE-settings-desktop -+ X-KDE-settings-looknfeel -+ X-KDE-settings-network -+ X-KDE-settings-webbrowsing -+ X-KDE-settings-peripherals -+ X-KDE-settings-hardware -+ X-KDE-settings-power -+ X-KDE-settings-security -+ X-KDE-settings-sound -+ X-KDE-settings-system -+ X-KDE-information - - - diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch deleted file mode 100644 index f5255cc5466e..000000000000 --- a/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 15baddac6c5343eaa103ecd27c625f5a415d24f3 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sat, 24 Nov 2012 15:24:50 -0500 -Subject: [PATCH] libmenu: always call menu_layout_load() with - non_prefixed_name parameter - -We must ensure that when loading "${XDG_MENU_PREFIX}applications.menu", -the root layout node's name is set to "applications", not -"${XDG_MENU_PREFIX}applications", because the menu spec states that the -default merge directory for "${XDG_MENU_PREFIX}applications.menu" is -"applications-merged", not "${XDG_MENU_PREFIX}applications-merged". - -https://bugzilla.gnome.org/show_bug.cgi?id=688972 ---- - libmenu/gmenu-tree.c | 29 ++++++++++++++++++++++++++--- - 1 file changed, 26 insertions(+), 3 deletions(-) - -diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c -index 0cb9645..a0d85d6 100644 ---- a/libmenu/gmenu-tree.c -+++ b/libmenu/gmenu-tree.c -@@ -47,6 +47,7 @@ struct GMenuTree - guint refcount; - - char *basename; -+ char *non_prefixed_basename; - char *absolute_path; - char *canonical_path; - -@@ -630,6 +631,24 @@ gmenu_tree_lookup (const char *menu_file, - return retval; - } - -+static void -+gmenu_tree_update_non_prefixed_basename (GMenuTree *tree, -+ const gchar *filename) -+{ -+ gchar *s, *basename; -+ -+ g_free (tree->non_prefixed_basename); -+ tree->non_prefixed_basename = NULL; -+ if (filename == NULL) -+ return; -+ s = g_strdup_printf ("%sapplications.menu", g_getenv ("XDG_MENU_PREFIX")); -+ basename = g_path_get_basename (filename); -+ if (!g_strcmp0 (basename, "applications.menu") || !g_strcmp0 (basename, s)) -+ tree->non_prefixed_basename = g_strdup ("applications.menu"); -+ g_free (s); -+ g_free (basename); -+} -+ - static GMenuTree * - gmenu_tree_new (GMenuTreeType type, - const char *menu_file, -@@ -650,11 +669,13 @@ gmenu_tree_new (GMenuTreeType type, - { - g_assert (canonical == FALSE); - tree->basename = g_strdup (menu_file); -+ gmenu_tree_update_non_prefixed_basename (tree, tree->basename); - } - else - { - tree->canonical = canonical != FALSE; - tree->absolute_path = g_strdup (menu_file); -+ gmenu_tree_update_non_prefixed_basename (tree, tree->absolute_path); - - if (tree->canonical) - { -@@ -709,6 +730,9 @@ gmenu_tree_unref (GMenuTree *tree) - g_free (tree->basename); - tree->basename = NULL; - -+ g_free (tree->non_prefixed_basename); -+ tree->non_prefixed_basename = NULL; -+ - if (tree->absolute_path != NULL) - g_free (tree->absolute_path); - tree->absolute_path = NULL; -@@ -1768,7 +1792,7 @@ load_merge_file (GMenuTree *tree, - - menu_verbose ("Merging file \"%s\"\n", canonical); - -- to_merge = menu_layout_load (canonical, NULL, NULL); -+ to_merge = menu_layout_load (canonical, tree->non_prefixed_basename, NULL); - if (to_merge == NULL) - { - menu_verbose ("No menu for file \"%s\" found when merging\n", -@@ -2926,8 +2950,7 @@ gmenu_tree_load_layout (GMenuTree *tree) - - error = NULL; - tree->layout = menu_layout_load (tree->canonical_path, -- tree->type == GMENU_TREE_BASENAME ? -- tree->basename : NULL, -+ tree->non_prefixed_basename, - &error); - if (tree->layout == NULL) - { --- -1.8.0 - diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch deleted file mode 100644 index b55ed7edd9f2..000000000000 --- a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f2ad7820b3a6b197f8cfec9e2bec877e51671ec9 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Thu, 18 Aug 2011 20:05:56 -0400 -Subject: [PATCH 2/2] Do not install anything other than the library - ---- - Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 565ab87..65c059a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ --SUBDIRS = libmenu desktop-directories layout util po -+SUBDIRS = libmenu util po - - if HAVE_PYTHON --SUBDIRS += python simple-editor -+SUBDIRS += python - endif - - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} --- -1.7.6 - diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch deleted file mode 100644 index 611415cb10f6..000000000000 --- a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch +++ /dev/null @@ -1,303 +0,0 @@ -From 6e7790b5451bbb8a44b736ed402964d1bb432247 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Mon, 26 Aug 2013 15:59:18 +0200 -Subject: [PATCH] layout: don't use OnlyUnallocated for sections different than - Other - -We used to have OnlyUnallocated on all non-folder sections, as -a quick way to enforce the whitelist, but that broke the Other -section. -Instead, we need a whitelist in the two folders, and a blacklist -in each category the application would normally be in (accessories -or system tools usually). -Ideally, apps in the Utilities category would expose the special -X-GNOME-Utilities desktop category, which we now recognize, but -the whitelist is kept to avoid patching all of them. -For the sundry category, ideally it should not be there at all. - -In the process, a number of .desktop files were removed, as they're -not provided by any packages (checked jhbuild and Fedora 19). They -are: -* caribou -* fedora-im-chooser -* fedora-abrt -* gnome-orca -* gnome-user-share-properties -* ibus -* ibus-daemon - -Distributions that are changing .desktop file names should take -care of patching gnome-menus appropriately. - -https://bugzilla.gnome.org/show_bug.cgi?id=706763 ---- - layout/gnome-applications.menu | 137 ++++++++++++++++++++++++----------------- - 1 file changed, 82 insertions(+), 55 deletions(-) - -diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu -index 503f9ca..db56f71 100644 ---- a/layout/gnome-applications.menu -+++ b/layout/gnome-applications.menu -@@ -21,44 +21,49 @@ - - - Accessories -- - Utility.directory - - - Utility -- -+ - Accessibility - System -- -- -- file-roller.desktop -- gnome-file-roller.desktop -- deja-dup-preferences.desktop -- gcalctool.desktop -- gucharmap.desktop -- gnome-gucharmap.desktop -- gnome-font-viewer.desktop -- seahorse.desktop -- gnome-terminal.desktop -- gnome-tweak-tool.desktop -- gnome-disks.desktop -- gnome-screenshot.desktop -- gnome-yelp.desktop -- yelp.desktop -- gnome-control-center.desktop -+ X-GNOME-Utilities - - -+ -+ -+ deja-dup-preferences.desktop -+ eog.desktop -+ evince.desktop -+ file-roller.desktop -+ gcalctool.desktop -+ gnome-control-center.desktop -+ gnome-dictionary.desktop -+ gnome-disks.desktop -+ gnome-font-viewer.desktop -+ gnome-screenshot.desktop -+ gnome-terminal.desktop -+ gnome-tweak-tool.desktop -+ gucharmap.desktop -+ seahorse.desktop -+ vinagre.desktop -+ yelp.desktop -+ -+ -+ alacarte.desktop -+ - - - - - - Universal Access -- - Utility-Accessibility.directory - - -@@ -66,12 +71,16 @@ - Settings - - -+ -+ -+ -+ orca.desktop -+ - - - - - Development -- - Development.directory - - -@@ -79,6 +88,15 @@ - - emacs.desktop - -+ -+ -+ -+ jhbuild.desktop -+ java-1.7.0-openjdk-jconsole.desktop -+ java-1.7.0-openjdk-policytool.desktop -+ log4j-chainsaw.desktop -+ log4j-logfactor5.desktop -+ - - - -@@ -106,7 +124,6 @@ - - - Graphics -- - Graphics.directory - - -@@ -121,15 +138,21 @@ - - - Internet -- - Network.directory - - - Network - X-GNOME-WebApplication -- vinagre.desktop - - -+ -+ -+ -+ vinagre.desktop -+ -+ -+ javaws.desktop -+ - - - -@@ -147,7 +170,6 @@ - - - Multimedia -- - AudioVideo.directory - - -@@ -159,7 +181,6 @@ - - - Office -- - Office.directory - - -@@ -176,20 +197,14 @@ - X-GNOME-Sundry.directory - - alacarte.desktop -- caribou.desktop -+ authconfig.desktop - dconf-editor.desktop -- fedora-im-chooser.desktop - fedora-release-notes.desktop - firewall-config.desktop - flash-player-properties.desktop - gconf-editor.desktop - gnome-abrt.desktop -- fedora-abrt.desktop -- gnome-orca.desktop - gnome-power-statistics.desktop -- gnome-user-share-properties.desktop -- ibus.desktop -- ibus-daemon.desktop - ibus-setup-anthy.desktop - ibus-setup.desktop - ibus-setup-hangul.desktop -@@ -208,7 +223,6 @@ - nm-connection-editor.desktop - orca.desktop - setroubleshoot.desktop -- authconfig.desktop - system-config-date.desktop - system-config-firewall.desktop - system-config-keyboard.desktop -@@ -222,17 +236,30 @@ - - - System -- - System-Tools.directory - - - System - Settings -- baobab.desktop -- gnome-system-log.desktop -- gnome-system-monitor.desktop -+ X-GNOME-Utilities - - -+ -+ -+ -+ baobab.desktop -+ gnome-system-log.desktop -+ gnome-system-monitor.desktop -+ -+ -+ dconf-editor.desktop -+ fedora-release-notes.desktop -+ gconf-editor.desktop -+ gnome-abrt.desktop -+ gnome-power-statistics.desktop -+ dconf-editor.desktop -+ setroubleshoot.desktop -+ - - - -@@ -249,26 +276,26 @@ - Utilities - X-GNOME-Utilities.directory - -+ X-GNOME-Utilities -+ baobab.desktop -+ deja-dup-preferences.desktop -+ eog.desktop -+ evince.desktop - file-roller.desktop - gcalctool.desktop -- gnome-font-viewer.desktop -- gucharmap.desktop -- seahorse.desktop -- gnome-terminal.desktop -- deja-dup-preferences.desktop -+ gnome-control-center.desktop - gnome-dictionary.desktop -- evince.desktop -- eog.desktop -- baobab.desktop -+ gnome-disks.desktop -+ gnome-font-viewer.desktop -+ gnome-screenshot.desktop - gnome-system-log.desktop - gnome-system-monitor.desktop -- vinagre.desktop -+ gnome-terminal.desktop - gnome-tweak-tool.desktop -- gnome-disks.desktop -- gnome-screenshot.desktop -- gnome-yelp.desktop -+ gucharmap.desktop -+ seahorse.desktop -+ vinagre.desktop - yelp.desktop -- gnome-control-center.desktop - - - --- -1.8.3.1 \ No newline at end of file diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch deleted file mode 100644 index 83a4a83d60bc..000000000000 --- a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Thu, 28 Mar 2013 21:54:34 +0000 -Subject: Adapt for gnome-calculator -> gcalctool desktop file rename - -gnome-calculator.desktop was renamed back to gcalctool.desktop, at the -very last minute before the 3.8.0 release. - -https://bugzilla.gnome.org/show_bug.cgi?id=696816 ---- -diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu -index 84d13ed..503f9ca 100644 ---- a/layout/gnome-applications.menu -+++ b/layout/gnome-applications.menu -@@ -38,7 +38,6 @@ - file-roller.desktop - gnome-file-roller.desktop - deja-dup-preferences.desktop -- gnome-calculator.desktop - gcalctool.desktop - gucharmap.desktop - gnome-gucharmap.desktop -@@ -251,7 +250,7 @@ - X-GNOME-Utilities.directory - - file-roller.desktop -- gnome-calculator.desktop -+ gcalctool.desktop - gnome-font-viewer.desktop - gucharmap.desktop - seahorse.desktop -@@ -287,7 +286,6 @@ - gnome-eog.desktop - gnome-file-roller.desktop - gnome-gucharmap.desktop -- gcalctool.desktop - - - --- -cgit v0.9.2 diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild deleted file mode 100644 index a8a245f59990..000000000000 --- a/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild,v 1.11 2013/04/09 16:43:03 ago Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -PYTHON_DEPEND="python? 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="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug +introspection python" - -RDEPEND=">=dev-libs/glib-2.18 - python? ( dev-python/pygtk ) - introspection? ( >=dev-libs/gobject-introspection-0.6.7 )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig - >=dev-util/intltool-0.40" - -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 - - G2CONF="${G2CONF} - --disable-static - $(use_enable python) - $(use_enable introspection)" -} - -src_prepare() { - gnome2_src_prepare - - # Don't show KDE standalone settings desktop files in GNOME others menu - epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch" - # https://bugzilla.gnome.org/show_bug.cgi?id=688972 - epatch "${FILESDIR}/${PN}-3.0.1-applications-merged.patch" - - # disable pyc compiling - python_clean_py-compile_files - - python_copy_sources -} - -src_configure() { - python_execute_function -s gnome2_src_configure -} - -src_compile() { - python_execute_function -s gnome2_src_compile -} - -src_test() { - python_execute_function -s -d -} - -src_install() { - python_execute_function -s gnome2_src_install - python_clean_installation_image - - # 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/ - doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed" - - use python && python_convert_shebangs -r 2 "${ED}"usr/bin/gmenu-simple-editor -} - -pkg_postinst() { - gnome2_pkg_postinst - if use python; then - python_mod_optimize GMenuSimpleEditor - fi - - ewarn "Due to bug #256614, you might lose icons in applications menus." - ewarn "If you use a login manager, please re-select your session." - ewarn "If you use startx and have no .xinitrc, just export XSESSION=Gnome." - ewarn "If you use startx and have .xinitrc, export XDG_MENU_PREFIX=gnome-." -} - -pkg_postrm() { - gnome2_pkg_postrm - if use python; then - python_mod_cleanup GMenuSimpleEditor - fi -} diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild deleted file mode 100644 index 3d821cedfd52..000000000000 --- a/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2014 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.0.1-r2.ebuild,v 1.5 2014/02/22 21:43:41 pacho Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" - -PYTHON_DEPEND="python? 2:2.5" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" - -inherit autotools 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="0" -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" - -IUSE="debug python +introspection" - -RDEPEND=">=dev-libs/glib-2.18 - introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig - >=dev-util/intltool-0.40 - - gnome-base/gnome-common - dev-libs/gobject-introspection-common" -# eautoreconf requires gnome-common -# The actual menus are provided by slot 3 -PDEPEND="gnome-base/gnome-menus:3" - -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 - - G2CONF="${G2CONF} - --disable-static - $(use_enable python) - $(use_enable introspection)" - - python_pkg_setup -} - -src_prepare() { - # Only build the library (everything else is coming from slot 3) - epatch "${FILESDIR}/${PN}-3.0.2-library-only.patch" - # https://bugzilla.gnome.org/show_bug.cgi?id=688972 - epatch "${FILESDIR}/${PN}-3.0.1-applications-merged.patch" - eautoreconf - gnome2_src_prepare - - # disable pyc compiling - python_clean_py-compile_files - - python_copy_sources -} - -src_configure() { - python_execute_function -s gnome2_src_configure -} - -src_compile() { - python_execute_function -s gnome2_src_compile -} - -src_test() { - python_execute_function -s -d -} - -src_install() { - python_execute_function -s gnome2_src_install - python_clean_installation_image -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild deleted file mode 100644 index 78d3a8a3e377..000000000000 --- a/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 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.10.1.ebuild,v 1.4 2014/03/09 11:58:42 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Library for the Desktop Menu fd.o specification" -HOMEPAGE="https://git.gnome.org/browse/gnome-menus" - -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" - -IUSE="debug +introspection test" - -COMMON_DEPEND=" - >=dev-libs/glib-2.29.15:2 - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) -" -# Older versions of slot 0 install the menu editor and the desktop directories - -RDEPEND="${COMMON_DEPEND} - ! -Date: Wed, 17 Nov 2010 17:41:17 +0000 -Subject: build: list the objects before the libraries to fix build with --as-needed - ---- -diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am -index c70ce9a..70d3937 100644 ---- a/applets/notification_area/Makefile.am -+++ b/applets/notification_area/Makefile.am -@@ -29,17 +29,18 @@ libtray_la_SOURCES = \ - NOTIFICATION_AREA_SOURCES = main.c - - NOTIFICATION_AREA_LDADD = \ -+ libtray.la \ - ../../libpanel-applet/libpanel-applet-3.la \ - $(X_LIBS) \ - $(NOTIFICATION_AREA_LIBS) \ -- $(LIBPANEL_APPLET_LIBS) \ -- libtray.la -+ $(LIBPANEL_APPLET_LIBS) - - testtray_SOURCES = testtray.c - testtray_LDADD = \ -+ libtray.la \ - $(X_LIBS) \ -- $(NOTIFICATION_AREA_LIBS) \ -- libtray.la -+ $(NOTIFICATION_AREA_LIBS) -+ - - if NOTIFICATION_AREA_INPROCESS - APPLET_IN_PROCESS = true --- -cgit v0.8.3.1 diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-evo-month.patch b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-evo-month.patch deleted file mode 100644 index 531de79be316..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-evo-month.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 241e288c0a9d30f9f2e8d608b0bbd950c1ac959c Mon Sep 17 00:00:00 2001 -From: Rodrigo Moya -Date: Mon, 02 May 2011 13:55:19 +0000 -Subject: clock applet: Pass the correct month to Evolution command line - -gtk_calendar_get_date returns the month between 0 and 11, so we need to add -1 to the month being passed to Evolution ---- -diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c -index c01bd6a..548b91b 100644 ---- a/applets/clock/calendar-window.c -+++ b/applets/clock/calendar-window.c -@@ -1245,7 +1245,7 @@ calendar_day_activated (GtkCalendar *calendar, - - argument = g_strdup_printf ("calendar:///?startdate=" - "%.4d%.2d%.2d", -- year, month, day); -+ year, month + 1, day); - - clock_launch_calendar_app (calwin, argument); - --- -cgit v0.9 diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-fix-multiscreen.patch b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-fix-multiscreen.patch deleted file mode 100644 index 3ef70fb0d384..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-fix-multiscreen.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 6812c83154f4e482d32745c9177b5b220ed3bfc7 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Tue, 1 Feb 2011 13:55:34 +0100 -Subject: [PATCH] panel: Fix dbus applets to work in multiscreen environment - -When the applet is created, the frame itself is not yet added to a -widget hierarchy, and is therefore not associated with any screen. So we -always sent the default screen as the one to be used to the applet. - -We can simply use the screen of the PanelWidget that will contain the -applet instead. - -https://bugzilla.gnome.org/show_bug.cgi?id=632369 ---- - .../panel-applet-container.c | 12 ++++++++---- - .../panel-applet-container.h | 1 + - .../panel-applet-frame-dbus.c | 4 +++- - gnome-panel/panel-applet-frame.c | 6 ++++++ - gnome-panel/panel-applet-frame.h | 1 + - gnome-panel/panel-test-applets.c | 1 + - 6 files changed, 20 insertions(+), 5 deletions(-) - -diff --git a/gnome-panel/libpanel-applet-private/panel-applet-container.c b/gnome-panel/libpanel-applet-private/panel-applet-container.c -index 886e7f2..fd51208 100644 ---- a/gnome-panel/libpanel-applet-private/panel-applet-container.c -+++ b/gnome-panel/libpanel-applet-private/panel-applet-container.c -@@ -447,6 +447,7 @@ on_factory_appeared (GDBusConnection *connection, - - static void - panel_applet_container_get_applet (PanelAppletContainer *container, -+ GdkScreen *screen, - const gchar *iid, - GVariant *props, - GCancellable *cancellable, -@@ -455,7 +456,7 @@ panel_applet_container_get_applet (PanelAppletContainer *container, - { - GSimpleAsyncResult *result; - AppletFactoryData *data; -- gint screen; -+ gint screen_number; - gchar *bus_name; - gchar *factory_id; - gchar *applet_id; -@@ -480,12 +481,14 @@ panel_applet_container_get_applet (PanelAppletContainer *container, - factory_id = g_strndup (iid, strlen (iid) - strlen (applet_id)); - applet_id += 2; - -- screen = gdk_screen_get_number (gtk_widget_get_screen (container->priv->socket)); -+ /* we can't use the screen of the container widget since it's not in a -+ * widget hierarchy yet */ -+ screen_number = gdk_screen_get_number (screen); - - data = g_new (AppletFactoryData, 1); - data->result = result; - data->factory_id = factory_id; -- data->parameters = g_variant_new ("(si*)", applet_id, screen, props); -+ data->parameters = g_variant_new ("(si*)", applet_id, screen_number, props); - data->cancellable = cancellable ? g_object_ref (cancellable) : NULL; - - bus_name = g_strdup_printf (PANEL_APPLET_BUS_NAME, factory_id); -@@ -504,6 +507,7 @@ panel_applet_container_get_applet (PanelAppletContainer *container, - - void - panel_applet_container_add (PanelAppletContainer *container, -+ GdkScreen *screen, - const gchar *iid, - GCancellable *cancellable, - GAsyncReadyCallback callback, -@@ -515,7 +519,7 @@ panel_applet_container_add (PanelAppletContainer *container, - - panel_applet_container_cancel_pending_operations (container); - -- panel_applet_container_get_applet (container, iid, properties, -+ panel_applet_container_get_applet (container, screen, iid, properties, - cancellable, callback, user_data); - } - -diff --git a/gnome-panel/libpanel-applet-private/panel-applet-container.h b/gnome-panel/libpanel-applet-private/panel-applet-container.h -index 130bf16..e4de97a 100644 ---- a/gnome-panel/libpanel-applet-private/panel-applet-container.h -+++ b/gnome-panel/libpanel-applet-private/panel-applet-container.h -@@ -73,6 +73,7 @@ GtkWidget *panel_applet_container_new (void); - - - void panel_applet_container_add (PanelAppletContainer *container, -+ GdkScreen *screen, - const gchar *iid, - GCancellable *cancellable, - GAsyncReadyCallback callback, -diff --git a/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c b/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c -index 9aaac15..dd3aecb 100644 ---- a/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c -+++ b/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c -@@ -411,6 +411,7 @@ panel_applet_frame_dbus_load (const gchar *iid, - PanelAppletFrameDBus *dbus_frame; - PanelAppletFrame *frame; - GVariantBuilder builder; -+ GdkScreen *screen; - gchar *conf_path; - gchar *background; - guint orient; -@@ -425,6 +426,7 @@ panel_applet_frame_dbus_load (const gchar *iid, - frame = PANEL_APPLET_FRAME (dbus_frame); - _panel_applet_frame_set_iid (frame, iid); - -+ screen = panel_applet_frame_activating_get_screen (frame_act); - orient = get_panel_applet_orient (panel_applet_frame_activating_get_orientation (frame_act)); - conf_path = panel_applet_frame_activating_get_conf_path (frame_act); - /* we can't really get a background string at this point since we don't -@@ -456,7 +458,7 @@ panel_applet_frame_dbus_load (const gchar *iid, - g_object_set_data (G_OBJECT (frame), "panel-applet-frame-activating", frame_act); - - panel_applet_container_add (dbus_frame->priv->container, -- iid, NULL, -+ screen, iid, NULL, - (GAsyncReadyCallback) panel_applet_frame_dbus_activated, - frame, - g_variant_builder_end (&builder)); -diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c -index be65965..8fb803c 100644 ---- a/gnome-panel/panel-applet-frame.c -+++ b/gnome-panel/panel-applet-frame.c -@@ -821,6 +821,12 @@ panel_applet_frame_activating_free (PanelAppletFrameActivating *frame_act) - g_slice_free (PanelAppletFrameActivating, frame_act); - } - -+GdkScreen * -+panel_applet_frame_activating_get_screen (PanelAppletFrameActivating *frame_act) -+{ -+ return gtk_widget_get_screen (frame_act->panel); -+} -+ - PanelOrientation - panel_applet_frame_activating_get_orientation (PanelAppletFrameActivating *frame_act) - { -diff --git a/gnome-panel/panel-applet-frame.h b/gnome-panel/panel-applet-frame.h -index a459bb7..a551c4c 100644 ---- a/gnome-panel/panel-applet-frame.h -+++ b/gnome-panel/panel-applet-frame.h -@@ -105,6 +105,7 @@ void panel_applet_frame_set_panel (PanelAppletFrame *frame, - - typedef struct _PanelAppletFrameActivating PanelAppletFrameActivating; - -+GdkScreen *panel_applet_frame_activating_get_screen (PanelAppletFrameActivating *frame_act); - PanelOrientation panel_applet_frame_activating_get_orientation (PanelAppletFrameActivating *frame_act); - guint32 panel_applet_frame_activating_get_size (PanelAppletFrameActivating *frame_act); - gboolean panel_applet_frame_activating_get_locked (PanelAppletFrameActivating *frame_act); -diff --git a/gnome-panel/panel-test-applets.c b/gnome-panel/panel-test-applets.c -index 58b1a3a..b302bc2 100644 ---- a/gnome-panel/panel-test-applets.c -+++ b/gnome-panel/panel-test-applets.c -@@ -164,6 +164,7 @@ load_applet_into_window (const char *title, - g_variant_builder_add (&builder, "{sv}", - "orient", g_variant_new_uint32 (orientation)); - panel_applet_container_add (PANEL_APPLET_CONTAINER (container), -+ gtk_widget_get_screen (applet_window), - title, NULL, - (GAsyncReadyCallback)applet_activated_cb, - applet_window, --- -1.7.3.4 \ No newline at end of file diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-fix-multiscreen2.patch b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-fix-multiscreen2.patch deleted file mode 100644 index 166c55496312..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-fix-multiscreen2.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 73d6cd1d1e43a9d45c6d477bce69baba6a921f05 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Tue, 1 Feb 2011 15:53:34 +0100 -Subject: [PATCH] libpanel-applet: Use right GdkScreen for focus request and menu - -Calling gtk_widget_get_screen() on a widget embedded in a plug doesn't -necessarily return what you expect (because of -gtk_widget_get_toplevel()). - -Instead, call gtk_window_get_screen() on the plug. - -https://bugzilla.gnome.org/show_bug.cgi?id=632369 ---- - libpanel-applet/panel-applet.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libpanel-applet/panel-applet.c b/libpanel-applet/panel-applet.c -index eb4bed2..86215c2 100644 ---- a/libpanel-applet/panel-applet.c -+++ b/libpanel-applet/panel-applet.c -@@ -703,7 +703,7 @@ panel_applet_request_focus (PanelApplet *applet, - - g_return_if_fail (PANEL_IS_APPLET (applet)); - -- screen = gtk_widget_get_screen (GTK_WIDGET (applet)); -+ screen = gtk_window_get_screen (GTK_WINDOW (applet->priv->plug)); - root = gdk_screen_get_root_window (screen); - display = gdk_screen_get_display (screen); - -@@ -957,7 +957,7 @@ panel_applet_position_menu (GtkMenu *menu, - - applet = PANEL_APPLET (widget); - -- screen = gtk_widget_get_screen (widget); -+ screen = gtk_window_get_screen (GTK_WINDOW (applet->priv->plug)); - - gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL); - gdk_window_get_origin (gtk_widget_get_window (widget), --- -1.7.3.4 \ No newline at end of file diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-gmodule.patch b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-gmodule.patch deleted file mode 100644 index e61df090e7b5..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-gmodule.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index da37bd9..0b15b7e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -79,7 +79,7 @@ dnl pkg-config dependency checks - - PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0) - --PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED) -+PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 >= $DBUS_GLIB_REQUIRED) - AC_SUBST(PANEL_CFLAGS) - AC_SUBST(PANEL_LIBS) - diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch deleted file mode 100644 index 008600344c84..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-underlinking.patch +++ /dev/null @@ -1,42 +0,0 @@ -From cd9bd4858f82fc6830c01aa8168bfafab6b6b868 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Mon, 15 Oct 2012 23:21:06 -0400 -Subject: [PATCH] build: fix underlinking - -https://bugs.gentoo.org/show_bug.cgi?id=384533 ---- - configure.ac | 3 +++ - gnome-panel/Makefile.am | 3 ++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3f8c214..da37bd9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,6 +31,9 @@ AC_PROG_LIBTOOL - #AC_PROG_SED available in 2.59b - AM_PROG_CC_C_O - -+AC_CHECK_LIBM -+AC_SUBST(LIBM) -+ - AM_PATH_PYTHON - AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) - AC_PATH_PROG(GCONFTOOL, gconftool-2) -diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am -index a341333..59c5dae 100644 ---- a/gnome-panel/Makefile.am -+++ b/gnome-panel/Makefile.am -@@ -134,7 +134,8 @@ gnome_panel_LDADD = \ - $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \ - $(PANEL_LIBS) \ - $(XRANDR_LIBS) \ -- $(X_LIBS) -+ $(X_LIBS) \ -+ $(LIBM) - - gnome_panel_LDFLAGS = -export-dynamic - --- -1.7.12.3 - diff --git a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-drop-commandline.patch b/gnome-base/gnome-panel/files/gnome-panel-3.6.2-drop-commandline.patch deleted file mode 100644 index e5fb774884c4..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-drop-commandline.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 452f59be8f9babf0ae33654e754da65151760a76 Mon Sep 17 00:00:00 2001 -From: Philipp Kaluza -Date: Fri, 08 Mar 2013 16:51:23 +0000 -Subject: drop support for commandline-based calendar/tasks applications - -It's not worth the layering violations this would need. -(Partial fix for bug #237308 .) ---- -diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c -index 458852c..708e921 100644 ---- a/applets/clock/calendar-window.c -+++ b/applets/clock/calendar-window.c -@@ -42,9 +42,6 @@ - #include - #include - --#define GNOME_DESKTOP_USE_UNSTABLE_API --#include -- - #include "calendar-window.h" - - #include "clock.h" -@@ -168,6 +165,13 @@ clock_launch_calendar_tasks_app (CalendarWindow *calwin, - return; - } - -+ /* FIXME: reintroduce terminal support if a proper GAppInfo port of gnome-panel is ever done */ -+ if (terminal) { -+ g_printerr ("Terminal-based calendar/tasks applications are no longer supported, sorry. " -+ "Please configure a different application.\n"); -+ return; -+ } -+ - command_line = g_find_program_in_path (program); - if (command_line == NULL) { - g_printerr ("Cannot launch calendar/tasks application: %s in path\n", program); -@@ -189,9 +193,6 @@ clock_launch_calendar_tasks_app (CalendarWindow *calwin, - screen = gtk_widget_get_screen (calwin->priv->calendar); - error = NULL; - -- if (terminal) -- gnome_desktop_prepend_terminal_to_vector (&argc, &argv); -- - display = gdk_screen_make_display_name (screen); - - result = g_spawn_async (NULL, /* working directory */ --- -cgit v0.9.1 diff --git a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-fix-animation.patch b/gnome-base/gnome-panel/files/gnome-panel-3.6.2-fix-animation.patch deleted file mode 100644 index 9d4449a07814..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-fix-animation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From be33e799d968a073c0a8856c96d11e8594b88bc4 Mon Sep 17 00:00:00 2001 -From: Yannick Gicquel -Date: Thu, 22 Nov 2012 07:37:26 +0000 -Subject: panel: Fix launcher icon animation ending with black artifact - -We simply need to hide the animation window before unref'ing the pixbuf. - -https://bugzilla.gnome.org/show_bug.cgi?id=688618 ---- -diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c -index 5acbf66..4f8b605 100644 ---- a/gnome-panel/xstuff.c -+++ b/gnome-panel/xstuff.c -@@ -326,12 +326,13 @@ zoom_draw (GtkWidget *widget, - g_source_remove (zoom->timeout_id); - zoom->timeout_id = 0; - -+ gtk_widget_hide (widget); -+ g_idle_add (idle_destroy, widget); -+ - g_object_unref (zoom->pixbuf); - zoom->pixbuf = NULL; - - g_slice_free (CompositedZoomData, zoom); -- -- g_idle_add (idle_destroy, widget); - } else { - GdkPixbuf *scaled; - int width, height; --- -cgit v0.9.1 diff --git a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-fix-black.patch b/gnome-base/gnome-panel/files/gnome-panel-3.6.2-fix-black.patch deleted file mode 100644 index 3917f0446cdb..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-fix-black.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 58b73a9e3129eb25f030f8d02bcd15303b300814 Mon Sep 17 00:00:00 2001 -From: Daniel Drake -Date: Mon, 17 Dec 2012 14:58:20 +0000 -Subject: na: apply style after realize - -Under Fedora 18 (GTK-3.6.2), notification icons such as the battery/power -icon from gnome-settings-daemon are appearing all-black on top of a black -background. - -This is because style_updated is being called before the tray applet -is realized, meaning that the following code in -na_tray_applet_style_updated() causes a bail-out: - - if (!applet->priv->tray) - return; - -and the style is never applied. - -Fix this by updating the style explicitly after realizing the widget. ---- -diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c -index 5fc4d1d..5dad715 100644 ---- a/applets/notification_area/main.c -+++ b/applets/notification_area/main.c -@@ -36,6 +36,8 @@ - - #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area" - -+static void na_tray_applet_style_updated (GtkWidget *widget); -+ - struct _NaTrayAppletPrivate - { - NaTray *tray; -@@ -78,6 +80,7 @@ na_tray_applet_realize (GtkWidget *widget) - get_gtk_orientation_from_applet_orient (orient)); - - gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (applet->priv->tray)); -+ na_tray_applet_style_updated (widget); - gtk_widget_show (GTK_WIDGET (applet->priv->tray)); - } - --- -cgit v0.9.1 diff --git a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-generic-marshaller.patch b/gnome-base/gnome-panel/files/gnome-panel-3.6.2-generic-marshaller.patch deleted file mode 100644 index 17a01622ec3c..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-generic-marshaller.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 1798ac8390d35824d98f716736647ff03ea151b3 Mon Sep 17 00:00:00 2001 -From: Jasper St. Pierre -Date: Fri, 04 Jan 2013 02:58:47 +0000 -Subject: notification_area: Use the generic marshaller - -The copy/paste code in gnome-shell has this change, so -make it here too as well. ---- -diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am -index 9734536..355737e 100644 ---- a/applets/notification_area/Makefile.am -+++ b/applets/notification_area/Makefile.am -@@ -17,8 +17,6 @@ AM_CFLAGS = $(WARN_CFLAGS) - libtray_la_SOURCES = \ - fixedtip.h \ - fixedtip.c \ -- na-marshal.c \ -- na-marshal.h \ - na-tray.c \ - na-tray.h \ - na-tray-child.c \ -@@ -61,15 +59,6 @@ notification_area_applet_LDADD = $(NOTIFICATION_AREA_LDADD) - notification_area_applet_CFLAGS = $(AM_CFLAGS) - endif - --na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL) -- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@ -- --na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL) -- $(AM_V_GEN)echo "#include \"na-marshal.h\"" > $@ && \ -- $(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@ -- --BUILT_SOURCES = na-marshal.c na-marshal.h -- - appletdir = $(appletsdir) - applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in - applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet) -@@ -97,8 +86,7 @@ endif - EXTRA_DIST = \ - org.gnome.panel.NotificationAreaApplet.panel-applet.in.in \ - $(ui_DATA) \ -- $(service_in_files) \ -- na-marshal.list -+ $(service_in_files) - - CLEANFILES = \ - $(applet_DATA) \ -diff --git a/applets/notification_area/fixedtip.c b/applets/notification_area/fixedtip.c -index 0e3c217..861e4ab 100644 ---- a/applets/notification_area/fixedtip.c -+++ b/applets/notification_area/fixedtip.c -@@ -91,8 +91,7 @@ na_fixed_tip_class_init (NaFixedTipClass *class) - G_OBJECT_CLASS_TYPE (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaFixedTipClass, clicked), -- NULL, NULL, -- g_cclosure_marshal_VOID__VOID, -+ NULL, NULL, NULL, - G_TYPE_NONE, 0); - - g_type_class_add_private (class, sizeof (NaFixedTipPrivate)); -diff --git a/applets/notification_area/na-marshal.list b/applets/notification_area/na-marshal.list -deleted file mode 100644 -index e3fc399..0000000 ---- a/applets/notification_area/na-marshal.list -+++ /dev/null -@@ -1,3 +0,0 @@ --VOID:OBJECT,OBJECT --VOID:OBJECT,STRING,LONG,LONG --VOID:OBJECT,LONG -diff --git a/applets/notification_area/na-tray-manager.c b/applets/notification_area/na-tray-manager.c -index da98f00..8999350 100644 ---- a/applets/notification_area/na-tray-manager.c -+++ b/applets/notification_area/na-tray-manager.c -@@ -34,8 +34,6 @@ - #endif - #include - --#include "na-marshal.h" -- - /* Signals */ - enum - { -@@ -146,8 +144,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_added), -- NULL, NULL, -- g_cclosure_marshal_VOID__OBJECT, -+ NULL, NULL, NULL, - G_TYPE_NONE, 1, - GTK_TYPE_SOCKET); - -@@ -156,8 +153,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_removed), -- NULL, NULL, -- g_cclosure_marshal_VOID__OBJECT, -+ NULL, NULL, NULL, - G_TYPE_NONE, 1, - GTK_TYPE_SOCKET); - manager_signals[MESSAGE_SENT] = -@@ -165,8 +161,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaTrayManagerClass, message_sent), -- NULL, NULL, -- _na_marshal_VOID__OBJECT_STRING_LONG_LONG, -+ NULL, NULL, NULL, - G_TYPE_NONE, 4, - GTK_TYPE_SOCKET, - G_TYPE_STRING, -@@ -177,8 +172,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaTrayManagerClass, message_cancelled), -- NULL, NULL, -- _na_marshal_VOID__OBJECT_LONG, -+ NULL, NULL, NULL, - G_TYPE_NONE, 2, - GTK_TYPE_SOCKET, - G_TYPE_LONG); -@@ -187,8 +181,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass) - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NaTrayManagerClass, lost_selection), -- NULL, NULL, -- g_cclosure_marshal_VOID__VOID, -+ NULL, NULL, NULL, - G_TYPE_NONE, 0); - - #if defined (GDK_WINDOWING_X11) --- -cgit v0.9.1 diff --git a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-gweather-include.patch b/gnome-base/gnome-panel/files/gnome-panel-3.6.2-gweather-include.patch deleted file mode 100644 index ef1128905d7e..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-gweather-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f5550422e202041a70cce8776785e3e651a01d8d Mon Sep 17 00:00:00 2001 -From: Philipp Kaluza -Date: Thu, 03 Jan 2013 10:51:19 +0000 -Subject: fix build error due to missing gweather-xml.h - -GWeather doesn't export the deprecated GWeatherXML anymore since -commit 354f1aa9003ee08c6e63ecbaaa6b9179b9178184 . Luckily, our last -usage of it is long gone. Remove leftover include. - -See https://bugzilla.redhat.com/show_bug.cgi?id=890219 ---- -diff --git a/applets/clock/clock.c b/applets/clock/clock.c -index 90ee62b..6b62daa 100644 ---- a/applets/clock/clock.c -+++ b/applets/clock/clock.c -@@ -54,7 +54,6 @@ - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include - --#include - #include - #include - #include --- -cgit v0.9.1 diff --git a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-rename-function.patch b/gnome-base/gnome-panel/files/gnome-panel-3.6.2-rename-function.patch deleted file mode 100644 index 95c843f5295e..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-rename-function.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 44eba7db43b227d9b15a2d64d0af97167522891d Mon Sep 17 00:00:00 2001 -From: Philipp Kaluza -Date: Fri, 08 Mar 2013 17:48:04 +0000 -Subject: panel-run-dialog: rename helper function - -that I resurrected earlier from gnome_desktop_prepend_terminal_to_vector -to panel_run_dialog_prepend_terminal_to_vector (use proper namespace). ---- -diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c -index faf3d7e..d89ac06 100644 ---- a/gnome-panel/panel-run-dialog.c -+++ b/gnome-panel/panel-run-dialog.c -@@ -336,7 +336,7 @@ dummy_child_watch (GPid pid, - - - /** -- * gnome_desktop_prepend_terminal_to_vector: -+ * panel_run_dialog_prepend_terminal_to_vector: - * @argc: a pointer to the vector size - * @argv: a pointer to the vector - * -@@ -349,10 +349,10 @@ dummy_child_watch (GPid pid, - * size will first be computed. Also note that passing in pointers to a vector - * that is empty, will just create a new vector for you. - **/ -+/* TODO: throw out this function if there ever is a proper GAppInfo port */ - static void --gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv) -+panel_run_dialog_prepend_terminal_to_vector (int *argc, char ***argv) - { --#ifndef G_OS_WIN32 - char **real_argv; - int real_argc; - int i, j; -@@ -367,8 +367,6 @@ gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv) - g_return_if_fail (argc != NULL); - g_return_if_fail (argv != NULL); - -- // _gnome_desktop_init_i18n (); -- - /* sanity */ - if(*argv == NULL) - *argc = 0; -@@ -460,10 +458,6 @@ gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv) - /* we use g_free here as we sucked all the inner strings - * out from it into real_argv */ - g_free (term_argv); --#else -- /* FIXME: Implement when needed */ -- g_warning ("gnome_prepend_terminal_to_vector: Not implemented"); --#endif - } - - static gboolean -@@ -485,7 +479,7 @@ panel_run_dialog_launch_command (PanelRunDialog *dialog, - screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog)); - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox))) -- gnome_desktop_prepend_terminal_to_vector (&argc, &argv); -+ panel_run_dialog_prepend_terminal_to_vector (&argc, &argv); - - display = gdk_screen_make_display_name (screen); - --- -cgit v0.9.1 diff --git a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-resurrect-function.patch b/gnome-base/gnome-panel/files/gnome-panel-3.6.2-resurrect-function.patch deleted file mode 100644 index e3eb89f67b90..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-3.6.2-resurrect-function.patch +++ /dev/null @@ -1,172 +0,0 @@ -From bf6af945130299a69a244afaee4eecbd3fb77233 Mon Sep 17 00:00:00 2001 -From: Philipp Kaluza -Date: Fri, 08 Mar 2013 17:08:32 +0000 -Subject: panel-run-dialog: resurrect function gnome_desktop_prepend_terminal_to_vector - -, which was removed from gnome-desktop in commit -9bab2144b7c8ace0c057720be3c48fb24a80a19d , and keep a local -copy in panel-run-dialog.c (simple helper function, static). -(Second half of fix for bug #237308 .) ---- -diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c -index 801b9bc..faf3d7e 100644 ---- a/gnome-panel/panel-run-dialog.c -+++ b/gnome-panel/panel-run-dialog.c -@@ -25,6 +25,7 @@ - * Havoc Pennington - * George Lebl - * Mark McLoughlin -+ * Tom Tromey (Copyright (C) 1998) - */ - - #include -@@ -42,8 +43,6 @@ - #include - #include - --#include -- - #include - #include - #include -@@ -335,6 +334,138 @@ dummy_child_watch (GPid pid, - */ - } - -+ -+/** -+ * gnome_desktop_prepend_terminal_to_vector: -+ * @argc: a pointer to the vector size -+ * @argv: a pointer to the vector -+ * -+ * Description: Prepends a terminal (either the one configured as default in -+ * the user's GNOME setup, or one of the common xterm emulators) to the passed -+ * in vector, modifying it in the process. The vector should be allocated with -+ * #g_malloc, as this will #g_free the original vector. Also all elements must -+ * have been allocated separately. That is the standard glib/GNOME way of -+ * doing vectors however. If the integer that @argc points to is negative, the -+ * size will first be computed. Also note that passing in pointers to a vector -+ * that is empty, will just create a new vector for you. -+ **/ -+static void -+gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv) -+{ -+#ifndef G_OS_WIN32 -+ char **real_argv; -+ int real_argc; -+ int i, j; -+ char **term_argv = NULL; -+ int term_argc = 0; -+ GSettings *settings; -+ -+ gchar *terminal = NULL; -+ -+ char **the_argv; -+ -+ g_return_if_fail (argc != NULL); -+ g_return_if_fail (argv != NULL); -+ -+ // _gnome_desktop_init_i18n (); -+ -+ /* sanity */ -+ if(*argv == NULL) -+ *argc = 0; -+ -+ the_argv = *argv; -+ -+ /* compute size if not given */ -+ if (*argc < 0) { -+ for (i = 0; the_argv[i] != NULL; i++) -+ ; -+ *argc = i; -+ } -+ -+ settings = g_settings_new ("org.gnome.desktop.default-applications.terminal"); -+ terminal = g_settings_get_string (settings, "exec"); -+ -+ if (terminal) { -+ gchar *command_line; -+ gchar *exec_flag; -+ -+ exec_flag = g_settings_get_string (settings, "exec-arg"); -+ -+ if (exec_flag == NULL) -+ command_line = g_strdup (terminal); -+ else -+ command_line = g_strdup_printf ("%s %s", terminal, -+ exec_flag); -+ -+ g_shell_parse_argv (command_line, -+ &term_argc, -+ &term_argv, -+ NULL /* error */); -+ -+ g_free (command_line); -+ g_free (exec_flag); -+ g_free (terminal); -+ } -+ -+ g_object_unref (settings); -+ -+ if (term_argv == NULL) { -+ char *check; -+ -+ term_argc = 2; -+ term_argv = g_new0 (char *, 3); -+ -+ check = g_find_program_in_path ("gnome-terminal"); -+ if (check != NULL) { -+ term_argv[0] = check; -+ /* Note that gnome-terminal takes -x and -+ * as -e in gnome-terminal is broken we use that. */ -+ term_argv[1] = g_strdup ("-x"); -+ } else { -+ if (check == NULL) -+ check = g_find_program_in_path ("nxterm"); -+ if (check == NULL) -+ check = g_find_program_in_path ("color-xterm"); -+ if (check == NULL) -+ check = g_find_program_in_path ("rxvt"); -+ if (check == NULL) -+ check = g_find_program_in_path ("xterm"); -+ if (check == NULL) -+ check = g_find_program_in_path ("dtterm"); -+ if (check == NULL) { -+ g_warning (_("Cannot find a terminal, using " -+ "xterm, even if it may not work")); -+ check = g_strdup ("xterm"); -+ } -+ term_argv[0] = check; -+ term_argv[1] = g_strdup ("-e"); -+ } -+ } -+ -+ real_argc = term_argc + *argc; -+ real_argv = g_new (char *, real_argc + 1); -+ -+ for (i = 0; i < term_argc; i++) -+ real_argv[i] = term_argv[i]; -+ -+ for (j = 0; j < *argc; j++, i++) -+ real_argv[i] = (char *)the_argv[j]; -+ -+ real_argv[i] = NULL; -+ -+ g_free (*argv); -+ *argv = real_argv; -+ *argc = real_argc; -+ -+ /* we use g_free here as we sucked all the inner strings -+ * out from it into real_argv */ -+ g_free (term_argv); -+#else -+ /* FIXME: Implement when needed */ -+ g_warning ("gnome_prepend_terminal_to_vector: Not implemented"); -+#endif -+} -+ - static gboolean - panel_run_dialog_launch_command (PanelRunDialog *dialog, - const char *command, --- -cgit v0.9.1 diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild deleted file mode 100644 index a312a3b360e3..000000000000 --- a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild,v 1.14 2014/01/04 02:44:19 tetromino Exp $ - -EAPI="3" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_DEPEND="2:2.5" - -inherit gnome2 python eutils autotools - -DESCRIPTION="The GNOME panel" -HOMEPAGE="http://www.gnome.org/" -SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2 - http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2" - -LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="+bonobo eds +introspection networkmanager" - -RDEPEND=">=gnome-base/gnome-desktop-2.26:2 - >=x11-libs/pango-1.15.4[introspection?] - >=dev-libs/glib-2.25.12:2 - >=x11-libs/gtk+-2.22:2[introspection?] - >=dev-libs/libgweather-2.27.90:2 - =gnome-base/gconf-2.6.1:2[introspection?] - >=media-libs/libcanberra-0.23[gtk] - >=gnome-base/gnome-menus-2.27.92:0 - gnome-base/librsvg:2 - >=dev-libs/dbus-glib-0.80 - >=sys-apps/dbus-1.1.2 - >=x11-libs/cairo-1 - x11-libs/libXau - >=x11-libs/libXrandr-1.2 - bonobo? ( - >=gnome-base/libbonobo-2.20.4 - >=gnome-base/libbonoboui-2.1.1 - >=gnome-base/orbit-2.4 - >=x11-libs/libwnck-2.19.5:1 ) - eds? ( >=gnome-extra/evolution-data-server-1.6 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) - networkmanager? ( >=net-misc/networkmanager-0.6.7 )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - dev-util/gtk-doc-am - >=app-text/gnome-doc-utils-0.3.2 - virtual/pkgconfig - >=dev-util/intltool-0.40 - app-text/docbook-xml-dtd:4.1.2 - gnome-base/gnome-common" -# eautoreconf needs -# gnome-base/gnome-common - -pkg_setup() { - G2CONF="${G2CONF} - --disable-deprecation-flags - --disable-static - --disable-scrollkeeper - --disable-schemas-install - $(use_enable bonobo) - $(use_enable networkmanager network-manager) - $(use_enable introspection) - $(use_enable eds)" - DOCS="AUTHORS ChangeLog HACKING NEWS README" - python_set_active_version 2 -} - -src_unpack() { - # If gobject-introspection is installed, we don't need the extra .m4 - if has_version "dev-libs/gobject-introspection"; then - unpack ${P}.tar.bz2 ${P}-patches.tar.bz2 - else - unpack ${A} - fi -} - -src_prepare() { - # List the objects before the libraries to fix build with --as-needed - epatch "${FILESDIR}/${P}-as-needed.patch" - - # Try to improve panel behavior on multiscreen systems, bug #348253, upstream #632369 - epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen.patch" - epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen2.patch" - - # Apply multiple bugfixes from 2.32 and master branches - # Also use gnome-applications.menu instead of applications.menu as it's the default value for us. - epatch "${WORKDIR}/${P}-patches"/*.patch - - # clock applet: Pass the correct month to Evolution command line - epatch "${FILESDIR}/${PN}-2.32.1-evo-month.patch" - - # Fix underlinking, bug #384533 - epatch "${FILESDIR}/${P}-underlinking.patch" - - # More underlinking, bug #496722 - epatch "${FILESDIR}/${P}-gmodule.patch" - - # automake-1.13 fix, bug #479890 - sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die - - AT_M4DIR=${WORKDIR} eautoreconf - gnome2_src_prepare -} - -pkg_postinst() { - local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries" - local gconftool="${EROOT}usr/bin/gconftool-2" - - if [ -e "$entries" ]; then - einfo "Setting panel gconf defaults..." - - GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")" - - "${gconftool}" --direct --config-source \ - "${GCONF_CONFIG_SOURCE}" --load="${entries}" - fi - - # Calling this late so it doesn't process the GConf schemas file we already - # took care of. - gnome2_pkg_postinst -} diff --git a/gnome-base/gnome-panel/gnome-panel-3.8.0-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-3.8.0-r1.ebuild deleted file mode 100644 index d34805cd7060..000000000000 --- a/gnome-base/gnome-panel/gnome-panel-3.8.0-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-3.8.0-r1.ebuild,v 1.5 2014/02/22 21:44:10 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="The GNOME panel" -HOMEPAGE="https://git.gnome.org/browse/gnome-panel" - -LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" -SLOT="0" -IUSE="eds +introspection networkmanager" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.31.14:2 - >=dev-libs/libgweather-3.5.1:2= - dev-libs/libxml2:2 - >=gnome-base/dconf-0.13.4 - >=gnome-base/gconf-2.6.1:2[introspection?] - >=gnome-base/gnome-desktop-2.91:3= - >=gnome-base/gnome-menus-3.1.4:3 - gnome-base/gsettings-desktop-schemas - gnome-base/librsvg:2 - >=net-libs/telepathy-glib-0.14 - sys-auth/polkit - >=x11-libs/cairo-1[X] - >=x11-libs/gdk-pixbuf-2.25.2:2 - >=x11-libs/gtk+-3.3.8:3[introspection?] - x11-libs/libXau - x11-libs/libICE - x11-libs/libSM - >=x11-libs/libXrandr-1.2 - >=x11-libs/libwnck-2.91:3 - >=x11-libs/pango-1.15.4[introspection?] - - eds? ( >=gnome-extra/evolution-data-server-3.5.3:= ) - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - networkmanager? ( >=net-misc/networkmanager-0.6.7 ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - app-text/yelp-tools - >=dev-lang/perl-5 - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - virtual/pkgconfig -" -# eautoreconf needs -# dev-libs/gobject-introspection-common -# gnome-base/gnome-common - -src_prepare() { - # Launch nautilus-classic, upstream bug #709016 - sed -i '/RequiredComponents/ s|$|nautilus-classic;|' data/gnome-flashback.session.desktop.in || die - gnome2_src_prepare -} - -src_configure() { - DOCS="AUTHORS ChangeLog HACKING NEWS README" - - # XXX: Make presence/telepathy-glib support optional? - # We can do that if we intend to support fallback-only as a setup - gnome2_src_configure \ - --disable-deprecation-flags \ - --disable-static \ - --with-in-process-applets=clock,notification-area,wncklet \ - --enable-telepathy-glib \ - $(use_enable networkmanager network-manager) \ - $(use_enable introspection) \ - $(use_enable eds) \ - ITSTOOL=$(type -P true) -} diff --git a/gnome-base/gnome-panel/metadata.xml b/gnome-base/gnome-panel/metadata.xml deleted file mode 100644 index 9edb90d697d5..000000000000 --- a/gnome-base/gnome-panel/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - -gnome - - Enable Bonobo compatibility modules for applets - still not ported to DBUS. - - diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index 2f22dca22b95..47b7bfe7d2e4 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -1,2 +1 @@ -DIST gnome-session-2.32.1.tar.bz2 774842 SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a SHA512 5d688e971ff440d33c7fff86db7b11d06aa39e9f6b4654a54ef6f4b608fe39c24b13be04726c69dbca4600fa91dc21b2f12415499367ec6045212828674bed99 WHIRLPOOL e03c121c5c644975deae06590828ce84a66e583838fc7de28752026e6c798b6fa4eaa4d6cdfa4975930c7ead730568e051c4dc280e5c7c80ab2bd4e64ffe9ca0 DIST gnome-session-3.12.1.tar.xz 718380 SHA256 fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3 SHA512 ee435aa31e2971f4d7246c748cace17a67f5697cbf016084aea4c263b2b2c096590b50920bc70ab45fb11e1470558f9c5b8864a37ae838f4a306ddc49acc5f2b WHIRLPOOL 41677526ad3323c7177ae592525f64d969004c475e9f17bddfb285a4d117a7cfc188c0b378b33f242be9a5d522441868b55f6c0a4f5029eb1949d195fef26517 diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome b/gnome-base/gnome-session/files/10-user-dirs-update-gnome deleted file mode 100755 index f909d44dacdf..000000000000 --- a/gnome-base/gnome-session/files/10-user-dirs-update-gnome +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc. -# That file is read by glib to get XDG_PICTURES_DIR, etc - -if [ "$DESKTOP_SESSION" = "gnome" ]; then - if type xdg-user-dirs-update &>/dev/null; then - xdg-user-dirs-update - fi -fi diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome b/gnome-base/gnome-session/files/15-xdg-data-gnome deleted file mode 100644 index e62f3e1c6baa..000000000000 --- a/gnome-base/gnome-session/files/15-xdg-data-gnome +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ "$DESKTOP_SESSION" = "gnome" ]; then - if [ -z "$XDG_DATA_DIRS" ]; then - export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ - else - export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS" - fi -fi diff --git a/gnome-base/gnome-session/files/defaults.list b/gnome-base/gnome-session/files/defaults.list deleted file mode 100644 index 572b5407002c..000000000000 --- a/gnome-base/gnome-session/files/defaults.list +++ /dev/null @@ -1,333 +0,0 @@ -[Default Applications] -application/rtf=abiword.desktop -application/x-abiword=abiword.desktop -text/abiword=abiword.desktop -text/richtext=abiword.desktop -text/rtf=abiword.desktop -text/x-abiword=abiword.desktop -text/x-xml-abiword=abiword.desktop -x-content/blank-bd=brasero-nautilus.desktop -x-content/blank-dvd=brasero-nautilus.desktop -x-content/blank-cd=brasero-nautilus.desktop -x-content/blank-hddvd=brasero-nautilus.desktop -application/x-dia-diagram=dia.desktop -image/bmp=eog.desktop -image/gif=eog.desktop -image/jpeg=eog.desktop -image/jpg=eog.desktop -image/pjpeg=eog.desktop -image/png=eog.desktop -image/svg+xml=eog.desktop -image/svg+xml-compressed=eog.desktop -image/x-bmp=eog.desktop -image/x-gray=eog.desktop -image/x-icb=eog.desktop -image/x-ico=eog.desktop -image/x-pcx=eog.desktop -image/x-png=eog.desktop -image/x-portable-anymap=eog.desktop -image/x-portable-bitmap=eog.desktop -image/x-portable-graymap=eog.desktop -image/x-portable-pixmap=eog.desktop -image/x-xbitmap=eog.desktop -image/x-xpixmap=eog.desktop -image/vnd.wap.wbmp=eog.desktop -image/g3fax=gimp.desktop -image/x-compressed-xcf=gimp.desktop -image/x-fits=gimp.desktop -image/x-icon=gimp.desktop -image/x-psd=gimp.desktop -image/x-sgi=gimp.desktop -image/x-sun-raster=gimp.desktop -image/x-tga=gimp.desktop -image/x-xcf=gimp.desktop -image/x-xwindowdump=gimp.desktop -application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop -text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop -application/pdf=evince.desktop -application/x-bzpdf=evince.desktop -application/x-gzpdf=evince.desktop -application/postscript=evince.desktop -application/x-bzpostscript=evince.desktop -application/x-gzpostscript=evince.desktop -image/x-eps=evince.desktop -image/x-bzeps=evince.desktop -image/x-gzeps=evince.desktop -application/x-dvi=evince.desktop -application/x-bzdvi=evince.desktop -application/x-gzdvi=evince.desktop -image/vnd.djvu=evince.desktop -image/tiff=evince.desktop -application/x-cbr=evince.desktop -application/x-cbz=evince.desktop -application/x-cb7=evince.desktop -application/x-7z-compressed=file-roller.desktop -application/x-7z-compressed-tar=file-roller.desktop -application/x-ace=file-roller.desktop -application/x-alz=file-roller.desktop -application/x-ar=file-roller.desktop -application/x-arj=file-roller.desktop -application/x-bzip=file-roller.desktop -application/x-bzip-compressed-tar=file-roller.desktop -application/x-bzip1=file-roller.desktop -application/x-bzip1-compressed-tar=file-roller.desktop -application/x-cabinet=file-roller.desktop -application/x-cd-image=file-roller.desktop -application/x-compress=file-roller.desktop -application/x-compressed-tar=file-roller.desktop -application/x-cpio=file-roller.desktop -application/x-deb=file-roller.desktop -application/x-ear=file-roller.desktop -application/x-gtar=file-roller.desktop -application/x-gzip=file-roller.desktop -application/x-java-archive=file-roller.desktop -application/x-lha=file-roller.desktop -application/x-lhz=file-roller.desktop -application/x-lzip=file-roller.desktop -application/x-lzip-compressed-tar=file-roller.desktop -application/x-lzma=file-roller.desktop -application/x-lzma-compressed-tar=file-roller.desktop -application/x-lzop=file-roller.desktop -application/x-lzop-compressed-tar=file-roller.desktop -application/x-rar=file-roller.desktop -application/x-rar-compressed=file-roller.desktop -application/x-rpm=file-roller.desktop -application/x-rzip=file-roller.desktop -application/x-tar=file-roller.desktop -application/x-tarz=file-roller.desktop -application/x-stuffit=file-roller.desktop -application/x-war=file-roller.desktop -application/x-xz=file-roller.desktop -application/x-xz-compressed-tar=file-roller.desktop -application/x-zip=file-roller.desktop -application/x-zip-compressed=file-roller.desktop -application/x-zoo=file-roller.desktop -application/zip=file-roller.desktop -multipart/x-zip=file-roller.desktop -text/plain=gedit.desktop -text/css=gedit.desktop -text/javascript=gedit.desktop -text/mathml=gedit.desktop -text/x-csrc=gedit.desktop -text/x-chdr=gedit.desktop -text/x-dtd=gedit.desktop -text/x-java=gedit.desktop -text/x-javascript=gedit.desktop -text/x-patch=gedit.desktop -text/x-perl=gedit.destkop -text/x-php=gedit.destkop -text/x-python=gedit.destkop -text/x-sql=gedit.desktop -text/xml=gedit.desktop -application/javascript=gedit.destkop -application/x-cgi=gedit.desktop -application/x-javascript=gedit.desktop -application/x-perl=gedit.desktop -application/x-php=gedit.desktop -application/x-python=gedit.desktop -application/xml=gedit.desktop -application/xml-dtd=gedit.desktop -application/x-font-ttf=gnome-font-viewer.desktop -application/x-font-pcf=gnome-font-viewer.desktop -application/x-font-type1=gnome-font-viewer.desktop -application/x-font-otf=gnome-font-viewer.desktop -application/csv=gnumeric.desktop -application/excel=gnumeric.desktop -application/msexcel=gnumeric.desktop -application/tab-separated-values=gnumeric.desktop -application/vnd.lotus-1-2-3=gnumeric.desktop -application/vnd.ms-excel=gnumeric.desktop -application/x-123=gnumeric.desktop -application/x-applix-spreadsheet=gnumeric.desktop -application/x-dbase=gnumeric.desktop -application/x-dbf=gnumeric.desktop -application/x-dos_ms_excel=gnumeric.desktop -application/x-excel=gnumeric.desktop -application/x-gnumeric=gnumeric.desktop -application/x-mps=gnumeric.desktop -application/x-ms-excel=gnumeric.desktop -application/x-msexcel=gnumeric.desktop -application/x-oleo=gnumeric.desktop -application/x-planperfect=gnumeric.desktop -application/x-quattropro=gnumeric.desktop -application/x-sc=gnumeric.desktop -application/x-sylk=gnumeric.desktop -application/x-xbase=gnumeric.desktop -application/x-xls=gnumeric.desktop -application/xls=gnumeric.desktop -text/comma-separated-values=gnumeric.desktop -text/csv=gnumeric.desktop -text/spreadsheet=gnumeric.desktop -text/tab-separated-values=gnumeric.desktop -text/x-comma-separated-values=gnumeric.desktop -text/x-csv=gnumeric.desktop -zz-application/zz-winassoc-xls=gnumeric.desktop -x-content/software=nautilus-autorun-software.desktop -x-directory/gnome-default-handler=nautilus-folder-handler.desktop -x-directory/normal=nautilus-folder-handler.desktop -inode/directory=nautilus-folder-handler.desktop -application/x-gnome-saved-search=nautilus-folder-handler.desktop -application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop -application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop -application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop -application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop -application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop -application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop -application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop -application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop -application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop -application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop -application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop -application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop -x-content/audio-player=rhythmbox.desktop -x-content/audio-cdda=sound-juicer.desktop -application/x-shockwave-flash=swfdec-player.desktop -application/futuresplash=swfdec-player.desktop -application/mxf=totem.desktop -application/ogg=totem.desktop -application/ram=totem.desktop -application/sdp=totem.desktop -application/smil=totem.desktop -application/smil+xml=totem.desktop -application/vnd.ms-wpl=totem.desktop -application/vnd.rn-realmedia=totem.desktop -application/x-extension-m4a=totem.desktop -application/x-extension-mp4=totem.desktop -application/x-flac=totem.desktop -application/x-flash-video=totem.desktop -application/x-matroska=totem.desktop -application/x-netshow-channel=totem.desktop -application/x-ogg=totem.desktop -application/x-quicktime-media-link=totem.desktop -application/x-quicktimeplayer=totem.desktop -application/x-shorten=totem.desktop -application/x-smil=totem.desktop -application/xspf+xml=totem.desktop -audio/3gpp=totem.desktop -audio/ac3=totem.desktop -audio/AMR=totem.desktop -audio/AMR-WB=totem.desktop -audio/basic=totem.desktop -audio/midi=totem.desktop -audio/mp4=totem.desktop -audio/mpeg=totem.desktop -audio/mpegurl=totem.desktop -audio/ogg=totem.desktop -audio/prs.sid=totem.desktop -audio/vnd.rn-realaudio=totem.desktop -audio/x-ape=totem.desktop -audio/x-flac=totem.desktop -audio/x-gsm=totem.desktop -audio/x-it=totem.desktop -audio/x-m4a=totem.desktop -audio/x-matroska=totem.desktop -audio/x-mod=totem.desktop -audio/x-mp3=totem.desktop -audio/x-mpeg=totem.desktop -audio/x-mpegurl=totem.desktop -audio/x-ms-asf=totem.desktop -audio/x-ms-asx=totem.desktop -audio/x-ms-wax=totem.desktop -audio/x-ms-wma=totem.desktop -audio/x-musepack=totem.desktop -audio/x-pn-aiff=totem.desktop -audio/x-pn-au=totem.desktop -audio/x-pn-realaudio=totem.desktop -audio/x-pn-realaudio-plugin=totem.desktop -audio/x-pn-wav=totem.desktop -audio/x-pn-windows-acm=totem.desktop -audio/x-realaudio=totem.desktop -audio/x-real-audio=totem.desktop -audio/x-sbc=totem.desktop -audio/x-scpls=totem.desktop -audio/x-speex=totem.desktop -audio/x-tta=totem.desktop -audio/x-vorbis=totem.desktop -audio/x-vorbis+ogg=totem.desktop -audio/x-wav=totem.desktop -audio/x-wavpack=totem.desktop -audio/x-xm=totem.desktop -image/vnd.rn-realpix=totem.desktop -image/x-pict=totem.desktop -misc/ultravox=totem.desktop -text/google-video-pointer=totem.desktop -text/x-google-video-pointer=totem.desktop -video/3gpp=totem.desktop -video/dv=totem.desktop -video/fli=totem.desktop -video/flv=totem.desktop -video/mp2t=totem.desktop -video/mp4=totem.desktop -video/mp4v-es=totem.desktop -video/mpeg=totem.desktop -video/msvideo=totem.desktop -video/ogg=totem.desktop -video/quicktime=totem.desktop -video/vivo=totem.desktop -video/vnd.divx=totem.desktop -video/vnd.rn-realvideo=totem.desktop -video/vnd.vivo=totem.desktop -video/webm=totem.desktop -video/x-anim=totem.desktop -video/x-avi=totem.desktop -video/x-flc=totem.desktop -video/x-fli=totem.desktop -video/x-flic=totem.desktop -video/x-flv=totem.desktop -video/x-m4v=totem.desktop -video/x-matroska=totem.desktop -video/x-mpeg=totem.desktop -video/x-ms-asf=totem.desktop -video/x-ms-asx=totem.desktop -video/x-msvideo=totem.desktop -video/x-ms-wm=totem.desktop -video/x-ms-wmv=totem.desktop -video/x-ms-wmx=totem.desktop -video/x-ms-wvx=totem.desktop -video/x-nsv=totem.desktop -video/x-ogm+ogg=totem.desktop -video/x-theora+ogg=totem.desktop -video/x-totem-stream=totem.desktop -x-content/video-dvd=totem.desktop -x-content/video-vcd=totem.desktop -x-content/video-svcd=totem.desktop -x-scheme-handler/ghelp=yelp.desktop; -x-scheme-handler/help=yelp.desktop; -x-scheme-handler/http=firefox.desktop;epiphany.desktop -x-scheme-handler/https=firefox.desktop;epiphany.desktop -x-scheme-handler/mailto=evolution.desktop \ No newline at end of file diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch b/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch deleted file mode 100644 index b407f9a4d880..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch +++ /dev/null @@ -1,559 +0,0 @@ -From c56898dcc1a73af37333b5df28f3b298a0c0669d Mon Sep 17 00:00:00 2001 -From: Priit Laes -Date: Thu, 9 Sep 2010 15:38:37 +0300 -Subject: [PATCH] Implement session saving UI in gnome-session-properties - -Original patch by Ghee Teo and Josselin Mouette - -https://bugzilla.gnome.org/show_bug.cgi?id=575544 ---- - capplet/gsm-properties-dialog.c | 63 ++++++++++++- - configure.ac | 1 + - data/session-properties.ui | 12 ++ - gnome-session/gsm-client.c | 10 ++ - gnome-session/gsm-client.h | 6 + - gnome-session/gsm-dbus-client.c | 14 +++ - gnome-session/gsm-manager.c | 150 +++++++++++++++++++++++++++- - gnome-session/gsm-manager.h | 3 + - gnome-session/gsm-xsmp-client.c | 37 +++++++ - gnome-session/gsm-xsmp-client.h | 3 +- - gnome-session/org.gnome.SessionManager.xml | 8 ++ - 11 files changed, 303 insertions(+), 4 deletions(-) - -diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c -index 84ef910..f54656e 100644 ---- a/capplet/gsm-properties-dialog.c -+++ b/capplet/gsm-properties-dialog.c -@@ -35,6 +35,12 @@ - #include "gsm-util.h" - #include "gsp-app.h" - #include "gsp-app-manager.h" -+#include -+#include -+ -+#define GSM_SERVICE_DBUS "org.gnome.SessionManager" -+#define GSM_PATH_DBUS "/org/gnome/SessionManager" -+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager" - - #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate)) - -@@ -50,6 +56,7 @@ - #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button" - #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button" - #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button" -+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label" - #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle" - - #define STARTUP_APP_ICON "system-run" -@@ -493,10 +500,64 @@ on_autosave_value_toggled (GtkToggleButton *button, - } - - static void -+session_saved_message (GsmPropertiesDialog *dialog, -+ const char *msg, -+ gboolean is_error) -+{ -+ GtkLabel *label; -+ gchar *markup; -+ label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME)); -+ if (is_error) -+ markup = g_markup_printf_escaped ("%s", msg); -+ else -+ markup = g_markup_escape_text (msg, -1); -+ gtk_label_set_markup (label, markup); -+ g_free (markup); -+} -+ -+static void -+session_saved_cb (DBusGProxy *proxy, -+ DBusGProxyCall *call_id, -+ void *user_data) -+{ -+ gboolean res; -+ GsmPropertiesDialog *dialog = user_data; -+ -+ res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID); -+ if (res) -+ session_saved_message (dialog, _("Your session has been saved."), FALSE); -+ else -+ session_saved_message (dialog, _("Failed to save session"), TRUE); -+ -+ g_object_unref (proxy); -+} -+ -+static void - on_save_session_clicked (GtkWidget *widget, - GsmPropertiesDialog *dialog) - { -- g_debug ("Session saving is not implemented yet!"); -+ DBusGConnection *conn; -+ DBusGProxy *proxy; -+ DBusGProxyCall *call; -+ -+ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); -+ if (conn == NULL) { -+ session_saved_message (dialog, _("Could not connect to the session bus"), TRUE); -+ return; -+ } -+ -+ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS); -+ if (proxy == NULL) { -+ session_saved_message (dialog, _("Could not connect to the session manager"), TRUE); -+ return; -+ } -+ -+ call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID); -+ if (call == NULL) { -+ session_saved_message (dialog, _("Failed to save session"), TRUE); -+ g_object_unref (proxy); -+ return; -+ } - } - - static void -diff --git a/configure.ac b/configure.ac -index 3988b4a..b2b96b8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(GNOME_SESSION, - PKG_CHECK_MODULES(SESSION_PROPERTIES, - glib-2.0 >= $GLIB_REQUIRED - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED -+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED - ) - - PKG_CHECK_MODULES(SM, sm) -diff --git a/data/session-properties.ui b/data/session-properties.ui -index 24f721d..3083fc1 100644 ---- a/data/session-properties.ui -+++ b/data/session-properties.ui -@@ -148,6 +148,7 @@ - True - - -+ True - True - True - -@@ -191,6 +192,17 @@ - 1 - - -+ -+ -+ True -+ True -+ -+ -+ False -+ False -+ 2 -+ -+ - - - 1 -diff --git a/gnome-session/gsm-client.c b/gnome-session/gsm-client.c -index b1c3c02..b063aca 100644 ---- a/gnome-session/gsm-client.c -+++ b/gnome-session/gsm-client.c -@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *client) - g_signal_emit (client, signals[DISCONNECTED], 0); - } - -+gboolean -+gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); -+ -+ return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error); -+} -+ - GKeyFile * - gsm_client_save (GsmClient *client, - GError **error) -diff --git a/gnome-session/gsm-client.h b/gnome-session/gsm-client.h -index 8fa28ad..a191e1d 100644 ---- a/gnome-session/gsm-client.h -+++ b/gnome-session/gsm-client.h -@@ -92,6 +92,9 @@ struct _GsmClientClass - GError **error); - gboolean (*impl_stop) (GsmClient *client, - GError **error); -+ gboolean (*impl_request_save) (GsmClient *client, -+ guint flags, -+ GError **error); - GKeyFile * (*impl_save) (GsmClient *client, - GError **error); - }; -@@ -137,6 +140,9 @@ gboolean gsm_client_cancel_end_session (GsmClient *client, - - void gsm_client_disconnected (GsmClient *client); - -+gboolean gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error); - GKeyFile *gsm_client_save (GsmClient *client, - GError **error); - /* exported to bus */ -diff --git a/gnome-session/gsm-dbus-client.c b/gnome-session/gsm-dbus-client.c -index e0aaf3d..a6ab43a 100644 ---- a/gnome-session/gsm-dbus-client.c -+++ b/gnome-session/gsm-dbus-client.c -@@ -413,6 +413,19 @@ gsm_dbus_client_finalize (GObject *object) - G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object); - } - -+static gboolean -+dbus_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_debug ("GsmDBusClient: sending save request to client with id %s", -+ gsm_client_peek_id (client)); -+ -+ /* FIXME: The protocol does not support this */ -+ -+ return FALSE; -+} -+ - static GKeyFile * - dbus_client_save (GsmClient *client, - GError **error) -@@ -665,6 +678,7 @@ gsm_dbus_client_class_init (GsmDBusClientClass *klass) - object_class->set_property = gsm_dbus_client_set_property; - object_class->dispose = gsm_dbus_client_dispose; - -+ client_class->impl_request_save = dbus_client_request_save; - client_class->impl_save = dbus_client_save; - client_class->impl_stop = dbus_client_stop; - client_class->impl_query_end_session = dbus_client_query_end_session; -diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c -index c85cea6..ca1a0ae 100644 ---- a/gnome-session/gsm-manager.c -+++ b/gnome-session/gsm-manager.c -@@ -68,6 +68,7 @@ - #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager" - - #define GSM_MANAGER_PHASE_TIMEOUT 10 /* seconds */ -+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2 - - #define GDM_FLEXISERVER_COMMAND "gdmflexiserver" - #define GDM_FLEXISERVER_ARGS "--startnew Standard" -@@ -1153,6 +1154,69 @@ query_end_session_complete (GsmManager *manager) - - } - -+static gboolean -+_client_request_save (GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ gboolean ret; -+ GError *error; -+ -+ error = NULL; -+ ret = gsm_client_request_save (client, data->flags, &error); -+ if (ret) { -+ g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client)); -+ data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients, -+ client); -+ } else if (error) { -+ g_debug ("GsmManager: unable to query client: %s", error->message); -+ g_error_free (error); -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+_client_request_save_helper (const char *id, -+ GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ return _client_request_save (client, data); -+} -+ -+static void -+query_save_session_complete (GsmManager *manager) -+{ -+ GError *error = NULL; -+ -+ if (g_slist_length (manager->priv->next_query_clients) > 0) { -+ ClientEndSessionData data; -+ -+ data.manager = manager; -+ data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST; -+ -+ g_slist_foreach (manager->priv->next_query_clients, -+ (GFunc)_client_request_save, -+ &data); -+ -+ g_slist_free (manager->priv->next_query_clients); -+ manager->priv->next_query_clients = NULL; -+ -+ return; -+ } -+ -+ if (manager->priv->query_timeout_id > 0) { -+ g_source_remove (manager->priv->query_timeout_id); -+ manager->priv->query_timeout_id = 0; -+ } -+ -+ gsm_session_save (manager->priv->clients, &error); -+ -+ if (error) { -+ g_warning ("Error saving session: %s", error->message); -+ g_error_free (error); -+ } -+} -+ - static guint32 - generate_cookie (void) - { -@@ -1227,6 +1291,21 @@ _on_query_end_session_timeout (GsmManager *manager) - return FALSE; - } - -+static gboolean -+_on_query_save_session_timeout (GsmManager *manager) -+{ -+ manager->priv->query_timeout_id = 0; -+ -+ g_debug ("GsmManager: query to save session timed out"); -+ -+ g_slist_free (manager->priv->query_clients); -+ manager->priv->query_clients = NULL; -+ -+ query_save_session_complete (manager); -+ -+ return FALSE; -+} -+ - static void - do_phase_query_end_session (GsmManager *manager) - { -@@ -1863,13 +1942,32 @@ on_client_end_session_response (GsmClient *client, - const char *reason, - GsmManager *manager) - { -- /* just ignore if received outside of shutdown */ -- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) { -+ /* just ignore if we are not yet running */ -+ if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) { - return; - } - - g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :""); - -+ if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) { -+ /* Ignore responses when no requests were sent */ -+ if (manager->priv->query_clients == NULL) { -+ return; -+ } -+ -+ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client); -+ -+ if (do_last) { -+ manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients, -+ client); -+ } -+ -+ if (manager->priv->query_clients == NULL) { -+ query_save_session_complete (manager); -+ } -+ return; -+ } -+ - if (cancel) { - cancel_end_session (manager); - return; -@@ -1968,6 +2066,15 @@ on_xsmp_client_logout_request (GsmXSMPClient *client, - } - - static void -+on_xsmp_client_save_request (GsmXSMPClient *client, -+ gboolean show_dialog, -+ GsmManager *manager) -+{ -+ g_debug ("GsmManager: save_request"); -+ gsm_manager_save_session (manager, NULL); -+} -+ -+static void - on_store_client_added (GsmStore *store, - const char *id, - GsmManager *manager) -@@ -1988,6 +2095,10 @@ on_store_client_added (GsmStore *store, - "logout-request", - G_CALLBACK (on_xsmp_client_logout_request), - manager); -+ g_signal_connect (client, -+ "save-request", -+ G_CALLBACK (on_xsmp_client_save_request), -+ manager); - } - - g_signal_connect (client, -@@ -2945,6 +3056,41 @@ gsm_manager_shutdown (GsmManager *manager, - } - - gboolean -+gsm_manager_save_session (GsmManager *manager, -+ GError **error) -+{ -+ ClientEndSessionData data; -+ -+ g_debug ("GsmManager: SaveSession called"); -+ -+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); -+ -+ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { -+ g_set_error (error, -+ GSM_MANAGER_ERROR, -+ GSM_MANAGER_ERROR_NOT_IN_RUNNING, -+ "SaveSession interface is only available during the Running phase"); -+ return FALSE; -+ } -+ -+ data.manager = manager; -+ data.flags = 0; -+ gsm_store_foreach (manager->priv->clients, -+ (GsmStoreFunc)_client_request_save_helper, -+ &data); -+ -+ if (manager->priv->query_clients) { -+ manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT, -+ (GSourceFunc)_on_query_save_session_timeout, -+ manager); -+ return TRUE; -+ } else { -+ g_debug ("GsmManager: Nothing to save"); -+ return FALSE; -+ } -+} -+ -+gboolean - gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error) -diff --git a/gnome-session/gsm-manager.h b/gnome-session/gsm-manager.h -index 17c70b3..dd6f198 100644 ---- a/gnome-session/gsm-manager.h -+++ b/gnome-session/gsm-manager.h -@@ -152,6 +152,9 @@ gboolean gsm_manager_is_inhibited (GsmManager - gboolean gsm_manager_shutdown (GsmManager *manager, - GError **error); - -+gboolean gsm_manager_save_session (GsmManager *manager, -+ GError **error); -+ - gboolean gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error); -diff --git a/gnome-session/gsm-xsmp-client.c b/gnome-session/gsm-xsmp-client.c -index ce22ed9..ed55406 100644 ---- a/gnome-session/gsm-xsmp-client.c -+++ b/gnome-session/gsm-xsmp-client.c -@@ -69,6 +69,7 @@ enum { - enum { - REGISTER_REQUEST, - LOGOUT_REQUEST, -+ SAVE_REQUEST, - LAST_SIGNAL - }; - -@@ -502,6 +503,30 @@ xsmp_cancel_end_session (GsmClient *client, - return TRUE; - } - -+static gboolean -+xsmp_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ GsmXSMPClient *xsmp = (GsmXSMPClient *) client; -+ -+ g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description); -+ -+ if (xsmp->priv->conn == NULL) { -+ g_set_error (error, -+ GSM_CLIENT_ERROR, -+ GSM_CLIENT_ERROR_NOT_REGISTERED, -+ "Client is not registered"); -+ return FALSE; -+ } -+ -+ if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST) -+ xsmp_save_yourself_phase2 (client); -+ else -+ do_save_yourself (xsmp, SmSaveLocal, FALSE); -+ -+ return TRUE; -+} - static char * - get_desktop_file_path (GsmXSMPClient *client) - { -@@ -976,6 +1001,7 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *klass) - object_class->get_property = gsm_xsmp_client_get_property; - object_class->set_property = gsm_xsmp_client_set_property; - -+ client_class->impl_request_save = xsmp_request_save; - client_class->impl_save = xsmp_save; - client_class->impl_stop = xsmp_stop; - client_class->impl_query_end_session = xsmp_query_end_session; -@@ -1006,6 +1032,17 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *klass) - G_TYPE_NONE, - 1, G_TYPE_BOOLEAN); - -+ signals[SAVE_REQUEST] = -+ g_signal_new ("save-request", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (GsmXSMPClientClass, save_request), -+ NULL, -+ NULL, -+ g_cclosure_marshal_VOID__BOOLEAN, -+ G_TYPE_NONE, -+ 1, G_TYPE_BOOLEAN); -+ - g_object_class_install_property (object_class, - PROP_ICE_CONNECTION, - g_param_spec_pointer ("ice-connection", -diff --git a/gnome-session/gsm-xsmp-client.h b/gnome-session/gsm-xsmp-client.h -index b80f933..4fa24fb 100644 ---- a/gnome-session/gsm-xsmp-client.h -+++ b/gnome-session/gsm-xsmp-client.h -@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass - char **client_id); - gboolean (*logout_request) (GsmXSMPClient *client, - gboolean prompt); -- -+ gboolean (*save_request) (GsmXSMPClient *client, -+ gboolean prompt); - - void (*saved_state) (GsmXSMPClient *client); - -diff --git a/gnome-session/org.gnome.SessionManager.xml b/gnome-session/org.gnome.SessionManager.xml -index b8bec4e..bece3f5 100644 ---- a/gnome-session/org.gnome.SessionManager.xml -+++ b/gnome-session/org.gnome.SessionManager.xml -@@ -256,6 +256,14 @@ - - - -+ -+ -+ -+ Request to save session -+ -+ -+ -+ - - - --- -1.7.2.2 - diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size.patch deleted file mode 100644 index c5cfcebbfd8b..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 8c4cdd5304929d19a27f876eb9cb5bbb67a4d59f Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Mon, 29 Nov 2010 21:44:03 +0000 -Subject: capplet: Give the dialog a reasonable default height - -https://bugzilla.gnome.org/show_bug.cgi?id=635891 ---- -diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c -index 4432b09..8b51169 100644 ---- a/capplet/gsm-properties-dialog.c -+++ b/capplet/gsm-properties-dialog.c -@@ -784,6 +784,7 @@ gsm_properties_dialog_init (GsmPropertiesDialog *dialog) - "main-notebook")); - gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0); - -+ gtk_window_set_default_size (GTK_WINDOW (dialog), -1, 450); - gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_box_set_spacing (GTK_BOX (content_area), 2); --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size2.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size2.patch deleted file mode 100644 index 39a02806d599..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6fd301895a39fc32f302ea3fced74fc03e5c75c9 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Mon, 29 Nov 2010 21:47:00 +0000 -Subject: capplet: Also give the dialog a reasonable width - -We don't want to depend on the natural size, which depends on the length -of strings for this. - -https://bugzilla.gnome.org/show_bug.cgi?id=635891 ---- -diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c -index 8b51169..487250e 100644 ---- a/capplet/gsm-properties-dialog.c -+++ b/capplet/gsm-properties-dialog.c -@@ -784,7 +784,7 @@ gsm_properties_dialog_init (GsmPropertiesDialog *dialog) - "main-notebook")); - gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0); - -- gtk_window_set_default_size (GTK_WINDOW (dialog), -1, 450); -+ gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 450); - gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_box_set_spacing (GTK_BOX (content_area), 2); --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-gnome3-conditions.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-gnome3-conditions.patch deleted file mode 100644 index a4c220732503..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.1-gnome3-conditions.patch +++ /dev/null @@ -1,107 +0,0 @@ -From d27c9dfb07e0d69ff37d029e5647bd68e7db7e95 Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan -Date: Mon, 4 Apr 2011 18:07:09 +0530 -Subject: [PATCH] Don't reject GNOME 3 session autostart conditions - -gnome-session-3.0 introduced a new AutostartCondition=GNOME3 directive. -See commit 58ebdfac for details on that. - -This commit adds detection for that directive instead of disabling .desktop -files with that. Now, apps are autostarted if they contain: - - AutostartCondition=GNOME3 is-session gnome-fallback -or - AutostartCondition=GNOME3 unless-session [something other than gnome-fallback] - -And are disabled for all other cases. ---- - gnome-session/gsm-autostart-app.c | 45 +++++++++++++++++++++++++++++++----- - 1 files changed, 38 insertions(+), 7 deletions(-) - -diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c -index 529a346..abc918f 100644 ---- a/gnome-session/gsm-autostart-app.c -+++ b/gnome-session/gsm-autostart-app.c -@@ -40,11 +40,14 @@ enum { - }; - - enum { -- GSM_CONDITION_NONE = 0, -- GSM_CONDITION_IF_EXISTS = 1, -- GSM_CONDITION_UNLESS_EXISTS = 2, -- GSM_CONDITION_GNOME = 3, -- GSM_CONDITION_UNKNOWN = 4 -+ GSM_CONDITION_NONE = 0, -+ GSM_CONDITION_IF_EXISTS = 1, -+ GSM_CONDITION_UNLESS_EXISTS = 2, -+ GSM_CONDITION_GNOME = 3, -+ GSM_CONDITION_GSETTINGS = 4, -+ GSM_CONDITION_IF_SESSION = 5, -+ GSM_CONDITION_UNLESS_SESSION = 6, -+ GSM_CONDITION_UNKNOWN = 7 - }; - - #define GSM_SESSION_CLIENT_DBUS_INTERFACE "org.gnome.SessionClient" -@@ -153,15 +156,31 @@ parse_condition_string (const char *condition_string, - key++; - } - -+ kind = GSM_CONDITION_UNKNOWN; -+ - if (!g_ascii_strncasecmp (condition_string, "if-exists", len) && key) { - kind = GSM_CONDITION_IF_EXISTS; - } else if (!g_ascii_strncasecmp (condition_string, "unless-exists", len) && key) { - kind = GSM_CONDITION_UNLESS_EXISTS; - } else if (!g_ascii_strncasecmp (condition_string, "GNOME", len)) { - kind = GSM_CONDITION_GNOME; -- } else { -+ } else if (!g_ascii_strncasecmp (condition_string, "GNOME3", len)) { -+ condition_string = key; -+ space = condition_string + strcspn (condition_string, " "); -+ len = space - condition_string; -+ key = space; -+ while (isspace ((unsigned char)*key)) { -+ key++; -+ } -+ if (!g_ascii_strncasecmp (condition_string, "if-session", len) && key) { -+ kind = GSM_CONDITION_IF_SESSION; -+ } else if (!g_ascii_strncasecmp (condition_string, "unless-session", len) && key) { -+ kind = GSM_CONDITION_UNLESS_SESSION; -+ } -+ } -+ -+ if (kind == GSM_CONDITION_UNKNOWN) { - key = NULL; -- kind = GSM_CONDITION_UNKNOWN; - } - - if (keyp != NULL) { -@@ -364,6 +383,12 @@ setup_condition_monitor (GsmAutostartApp *app) - gconf_condition_cb, - app, NULL, NULL); - g_object_unref (client); -+ } else if (kind == GSM_CONDITION_IF_SESSION) { -+ /* We treat GNOME 2.32 as the same as gnome-fallback */ -+ disabled = strcmp ("gnome-fallback", key) != 0; -+ } else if (kind == GSM_CONDITION_UNLESS_SESSION) { -+ /* We treat GNOME 2.32 as the same as gnome-fallback */ -+ disabled = strcmp ("gnome-fallback", key) == 0; - } else { - disabled = TRUE; - } -@@ -647,6 +672,12 @@ is_conditionally_disabled (GsmApp *app) - g_assert (GCONF_IS_CLIENT (client)); - disabled = !gconf_client_get_bool (client, key, NULL); - g_object_unref (client); -+ } else if (kind == GSM_CONDITION_IF_SESSION) { -+ /* We treat GNOME 2.32 as the same as gnome-fallback */ -+ disabled = strcmp ("gnome-fallback", key) != 0; -+ } else if (kind == GSM_CONDITION_UNLESS_SESSION) { -+ /* We treat GNOME 2.32 as the same as gnome-fallback */ -+ disabled = strcmp ("gnome-fallback", key) == 0; - } else { - disabled = TRUE; - } --- -1.7.3.4 - diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-gsettings-conditions.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-gsettings-conditions.patch deleted file mode 100644 index 9c272375e3eb..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.1-gsettings-conditions.patch +++ /dev/null @@ -1,135 +0,0 @@ ---- gnome-session/gsm-autostart-app.c.old 2011-09-12 11:06:20.552420744 +0200 -+++ gnome-session/gsm-autostart-app.c 2011-09-12 11:18:39.934966203 +0200 -@@ -66,6 +66,7 @@ - - GFileMonitor *condition_monitor; - guint condition_notify_id; -+ GSettings *condition_settings; - - int launch_type; - GPid pid; -@@ -164,6 +165,8 @@ - kind = GSM_CONDITION_UNLESS_EXISTS; - } else if (!g_ascii_strncasecmp (condition_string, "GNOME", len)) { - kind = GSM_CONDITION_GNOME; -+ } else if (!g_ascii_strncasecmp (condition_string, "GSettings", len)) { -+ kind = GSM_CONDITION_GSETTINGS; - } else if (!g_ascii_strncasecmp (condition_string, "GNOME3", len)) { - condition_string = key; - space = condition_string + strcspn (condition_string, " "); -@@ -289,6 +292,81 @@ - } - - static void -+gsettings_condition_cb (GSettings *settings, -+ const char *key, -+ gpointer user_data) -+{ -+ GsmApp *app; -+ GsmAutostartAppPrivate *priv; -+ gboolean condition; -+ -+ g_return_if_fail (GSM_IS_APP (user_data)); -+ -+ app = GSM_APP (user_data); -+ -+ priv = GSM_AUTOSTART_APP (app)->priv; -+ -+ condition = g_settings_get_boolean (settings, key); -+ -+ g_debug ("GsmAutostartApp: app:%s condition changed condition:%d", -+ gsm_app_peek_id (app), -+ condition); -+ -+ /* Emit only if the condition actually changed */ -+ if (condition != priv->condition) { -+ priv->condition = condition; -+ g_signal_emit (app, signals[CONDITION_CHANGED], 0, condition); -+ } -+} -+ -+static gboolean -+setup_gsettings_condition_monitor (GsmAutostartApp *app, -+ const char *key) -+{ -+ GSettings *settings; -+ const char * const *schemas; -+ char **elems; -+ gboolean schema_exists; -+ guint i; -+ gboolean retval; -+ char *signal; -+ -+ elems = g_strsplit (key, " ", 2); -+ if (elems == NULL) -+ return FALSE; -+ if (elems[0] == NULL || elems[1] == NULL) { -+ g_strfreev (elems); -+ return FALSE; -+ } -+ -+ schemas = g_settings_list_schemas (); -+ schema_exists = FALSE; -+ for (i = 0; schemas[i] != NULL; i++) { -+ if (g_str_equal (schemas[i], elems[0])) { -+ schema_exists = TRUE; -+ break; -+ } -+ } -+ -+ if (schema_exists == FALSE) -+ return FALSE; -+ -+ settings = g_settings_new (elems[0]); -+ retval = g_settings_get_boolean (settings, elems[1]); -+ -+ signal = g_strdup_printf ("changed::%s", elems[1]); -+ g_signal_connect (G_OBJECT (settings), signal, -+ G_CALLBACK (gsettings_condition_cb), app); -+ g_free (signal); -+ -+ app->priv->condition_settings = settings; -+ -+ g_strfreev (elems); -+ -+ return retval; -+} -+ -+static void - setup_condition_monitor (GsmAutostartApp *app) - { - guint kind; -@@ -383,6 +461,8 @@ - gconf_condition_cb, - app, NULL, NULL); - g_object_unref (client); -+ } else if (kind == GSM_CONDITION_GSETTINGS) { -+ disabled = !setup_gsettings_condition_monitor (app, key); - } else if (kind == GSM_CONDITION_IF_SESSION) { - /* We treat GNOME 2.32 as the same as gnome-fallback */ - disabled = strcmp ("gnome-fallback", key) != 0; -@@ -578,6 +658,11 @@ - priv->condition_string = NULL; - } - -+ if (priv->condition_settings) { -+ g_object_unref (priv->condition_settings); -+ priv->condition_settings = NULL; -+ } -+ - if (priv->desktop_file) { - egg_desktop_file_free (priv->desktop_file); - priv->desktop_file = NULL; -@@ -672,6 +757,12 @@ - g_assert (GCONF_IS_CLIENT (client)); - disabled = !gconf_client_get_bool (client, key, NULL); - g_object_unref (client); -+ } else if (kind == GSM_CONDITION_GSETTINGS && -+ priv->condition_settings != NULL) { -+ char **elems; -+ elems = g_strsplit (key, " ", 2); -+ disabled = !g_settings_get_boolean (priv->condition_settings, elems[1]); -+ g_strfreev (elems); - } else if (kind == GSM_CONDITION_IF_SESSION) { - /* We treat GNOME 2.32 as the same as gnome-fallback */ - disabled = strcmp ("gnome-fallback", key) != 0; diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-idle-transition.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-idle-transition.patch deleted file mode 100644 index 4fb215151d12..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-2.32.1-idle-transition.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 861313503a741f0129611ca005cf6d7c27124b54 Mon Sep 17 00:00:00 2001 -From: Christopher Halse Rogers -Date: Thu, 26 May 2011 09:09:14 +0000 -Subject: gsm: Fix race condition in idle monitor - -In _xsync_alarm_set(), the positive and negative transition intervals -are set to the same value. However, the SYNC extension defines the -positive transition as set when the counter goes from strictly below the -threshold to greater than or equal to the threshold and similarly a -negative transition is triggered when the counter goes form strictly -greater than the threshold to less than or equal to the threshold. - -Thus in the current set up there's a chance that the positive transition -can trigger, marking the session as idle, and some user input occur on -the same click so the IDLETIME count will hit the threshold but not go -above so the negative transition will not trigger. Thus the session will -not be marked as active. - -The negative transition threshold should be set to 1ms less than the -positive transition to ensure that it always fires. - -https://bugzilla.gnome.org/show_bug.cgi?id=627903 ---- -diff --git a/gnome-session/gs-idle-monitor.c b/gnome-session/gs-idle-monitor.c -index cd38dcb..d25144f 100644 ---- a/gnome-session/gs-idle-monitor.c -+++ b/gnome-session/gs-idle-monitor.c -@@ -463,6 +463,7 @@ _xsync_alarm_set (GSIdleMonitor *monitor, - watch->xalarm_positive = XSyncCreateAlarm (monitor->priv->display, flags, &attr); - } - -+ attr.trigger.wait_value = _int64_to_xsyncvalue (_xsyncvalue_to_int64 (watch->interval) - 1); - attr.trigger.test_type = XSyncNegativeTransition; - if (watch->xalarm_negative != None) { - g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld", --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch b/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch deleted file mode 100644 index 3f28c2b2a60d..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f11f157d507495589b0f4930f4fcc431c87bc121 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Tue, 12 Nov 2013 13:32:45 +0000 -Subject: data: blacklist nv25 - -It doesn't work very well. - -https://bugzilla.gnome.org/show_bug.cgi?id=711347 ---- -diff --git a/data/hardware-compatibility b/data/hardware-compatibility -index 927ba8b..48b7946 100644 ---- a/data/hardware-compatibility -+++ b/data/hardware-compatibility -@@ -27,3 +27,6 @@ - - # Gallium has softpipe; we explicitly enable llvmpipe - -softpipe -+ -+# nouveau vieux NV25 doesn't work too well -+-Mesa DRI nv25 --- -cgit v0.9.2 diff --git a/gnome-base/gnome-session/files/gnome-session-3.8.4-presence-crash.patch b/gnome-base/gnome-session/files/gnome-session-3.8.4-presence-crash.patch deleted file mode 100644 index e76f433a9c1b..000000000000 --- a/gnome-base/gnome-session/files/gnome-session-3.8.4-presence-crash.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 90714db611d6ced5202421ef3ba99334f1e9e6ec Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Fri, 01 Nov 2013 20:30:06 +0000 -Subject: Fix a possible crash in the presence interface - -Improper error handling in gsm_presence_set_status_text() would -lead to a double free on the next call to that function. -Found using the dfuzzer tool, -https://github.com/matusmarhefka/dfuzzer ---- -diff --git a/gnome-session/gsm-presence.c b/gnome-session/gsm-presence.c -index f6a022f..93ca1a0 100644 ---- a/gnome-session/gsm-presence.c -+++ b/gnome-session/gsm-presence.c -@@ -365,6 +365,7 @@ gsm_presence_set_status_text (GsmPresence *presence, - g_return_val_if_fail (GSM_IS_PRESENCE (presence), FALSE); - - g_free (presence->priv->status_text); -+ presence->priv->status_text = NULL; - - /* check length */ - if (status_text != NULL && strlen (status_text) > MAX_STATUS_TEXT) { -@@ -377,11 +378,11 @@ gsm_presence_set_status_text (GsmPresence *presence, - - if (status_text != NULL) { - presence->priv->status_text = g_strdup (status_text); -- } else { -- presence->priv->status_text = g_strdup (""); - } -+ - g_object_notify (G_OBJECT (presence), "status-text"); -- g_signal_emit (presence, signals[STATUS_TEXT_CHANGED], 0, presence->priv->status_text); -+ g_signal_emit (presence, signals[STATUS_TEXT_CHANGED], 0, -+ presence->priv->status_text ? presence->priv->status_text : ""); - return TRUE; - } - -@@ -457,7 +458,7 @@ gsm_presence_get_property (GObject *object, - g_value_set_uint (value, self->priv->status); - break; - case PROP_STATUS_TEXT: -- g_value_set_string (value, self->priv->status_text); -+ g_value_set_string (value, self->priv->status_text ? self->priv->status_text : ""); - break; - case PROP_IDLE_ENABLED: - g_value_set_boolean (value, self->priv->idle_enabled); --- -cgit v0.9.2 diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild deleted file mode 100644 index d87475aa2e45..000000000000 --- a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.13 2014/06/01 08:03:47 pacho Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools eutils gnome2 - -DESCRIPTION="Gnome session manager" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" - -IUSE="doc ipv6 elibc_FreeBSD" - -# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and -# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* -# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). -# >=gconf-3.2.6 no longer provides gconf-sanity-check-2 -RDEPEND=">=dev-libs/glib-2.16:2 - >=x11-libs/gtk+-2.22.0:2 - >=dev-libs/dbus-glib-0.76 - >=gnome-base/gconf-2:2[gtk(+)] - -Date: Sat, 16 Oct 2010 00:44:12 +0000 -Subject: xsettings: Export Xft.lcdfilter for OO.o's benefit - -Export Xft.lcdfilter legacy setting for the benefit of OpenOffice.org -which doesn't follow the other fontconfig settings. - -https://bugzilla.gnome.org/show_bug.cgi?id=631924 ---- -diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c -index 0d9df70..8798a9e 100644 ---- a/plugins/xsettings/gsd-xsettings-manager.c -+++ b/plugins/xsettings/gsd-xsettings-manager.c -@@ -357,6 +357,8 @@ xft_settings_set_xsettings (GnomeXSettingsManager *manager, - xsettings_manager_set_string (manager->priv->managers [i], "Xft/HintStyle", settings->hintstyle); - xsettings_manager_set_int (manager->priv->managers [i], "Xft/DPI", settings->dpi); - xsettings_manager_set_string (manager->priv->managers [i], "Xft/RGBA", settings->rgba); -+ xsettings_manager_set_string (manager->priv->managers [i], "Xft/lcdfilter", -+ g_str_equal (settings->rgba, "rgb") ? "lcddefault" : "none"); - } - gnome_settings_profile_end (NULL); - } -@@ -416,6 +418,8 @@ xft_settings_set_xresources (GnomeXftSettings *settings) - settings->hintstyle); - update_property (add_string, "Xft.rgba", - settings->rgba); -+ update_property (add_string, "Xft.lcdfilter", -+ g_str_equal (settings->rgba, "rgb") ? "lcddefault" : "none"); - - g_debug("xft_settings_set_xresources: new res '%s'", add_string->str); - --- -cgit v0.8.3.1 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch deleted file mode 100644 index f755f24acddf..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c -+++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c -@@ -48,6 +48,9 @@ - - #ifdef HAVE_LIBNOTIFY - #include -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif /* HAVE_LIBNOTIFY */ - - #include "gnome-settings-profile.h" -@@ -608,9 +611,13 @@ - gsd_a11y_keyboard_manager_ensure_status_icon (manager); - manager->priv->notification = notify_notification_new (title, - message, -- "preferences-desktop-accessibility", -- NULL); -+ "preferences-desktop-accessibility" -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , NULL); - notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon); -+#endif - notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000); - - notify_notification_add_action (manager->priv->notification, -@@ -747,9 +754,13 @@ - gsd_a11y_keyboard_manager_ensure_status_icon (manager); - manager->priv->notification = notify_notification_new (title, - message, -- "preferences-desktop-accessibility", -- NULL); -+ "preferences-desktop-accessibility" -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , NULL); - notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon); -+#endif - notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000); - - notify_notification_add_action (manager->priv->notification, ---- plugins/xrandr/gsd-xrandr-manager.c -+++ plugins/xrandr/gsd-xrandr-manager.c -@@ -48,6 +48,9 @@ - - #ifdef HAVE_LIBNOTIFY - #include -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif - - #include "gnome-settings-profile.h" -@@ -1086,6 +1089,11 @@ - - g_assert (error_to_display == NULL || secondary_text == NULL); - -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ notification = notify_notification_new (primary_text, -+ error_to_display ? error_to_display->message : secondary_text, -+ GSD_XRANDR_ICON_NAME); -+#else - if (priv->status_icon) - notification = notify_notification_new_with_status_icon (primary_text, - error_to_display ? error_to_display->message : secondary_text, -@@ -1096,6 +1104,7 @@ - error_to_display ? error_to_display->message : secondary_text, - GSD_XRANDR_ICON_NAME, - NULL); -+#endif - - notify_notification_show (notification, NULL); /* NULL-GError */ - #else diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch deleted file mode 100644 index b1e644f5d51b..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c ---- gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c 2010-11-15 05:11:00.000000000 -0800 -+++ gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c 2011-03-17 11:52:57.516694024 -0700 -@@ -2530,6 +2530,10 @@ - - manager->priv->current_fn_f7_config = -1; - manager->priv->fn_f7_configs = NULL; -+ -+#ifdef HAVE_LIBNOTIFY -+ notify_init ("gnome-settings-daemon"); -+#endif /* HAVE_LIBNOTIFY */ - } - - static void diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch deleted file mode 100644 index 5a2c04555f2d..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c9a6a27aa766b31d9f32d182b1de5886793e906b Mon Sep 17 00:00:00 2001 -From: Rodrigo Moya -Date: Tue, 19 Apr 2011 13:59:35 +0000 -Subject: media-keys: React to stream-removed signal from GvcMixerControl - ---- -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index b563f73..1f18074 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -794,6 +794,19 @@ on_control_default_sink_changed (GvcMixerControl *control, - update_default_sink (manager); - } - -+static void -+on_control_stream_removed (GvcMixerControl *control, -+ guint id, -+ GsdMediaKeysManager *manager) -+{ -+ if (manager->priv->stream != NULL) { -+ if (gvc_mixer_stream_get_id (manager->priv->stream) == id) { -+ g_object_unref (manager->priv->stream); -+ manager->priv->stream = NULL; -+ } -+ } -+} -+ - #endif /* HAVE_PULSE */ - - static gint -@@ -1118,6 +1131,10 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager, - "default-sink-changed", - G_CALLBACK (on_control_default_sink_changed), - manager); -+ g_signal_connect (manager->priv->volume, -+ "stream-removed", -+ G_CALLBACK (on_control_stream_removed), -+ manager); - - gvc_mixer_control_open (manager->priv->volume); - --- -cgit v0.9 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch deleted file mode 100644 index 58150e56dd17..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 54ce24f4947256e1991970eed40bafd1b7028cf6 Mon Sep 17 00:00:00 2001 -From: Josselin Mouette -Date: Tue, 12 Oct 2010 19:19:44 +0000 -Subject: housekeeping: More network filesystems not to monitor - -https://bugzilla.gnome.org/show_bug.cgi?id=606421 ---- -diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c -index e1385ea..2fcc523 100644 ---- a/plugins/housekeeping/gsd-disk-space.c -+++ b/plugins/housekeeping/gsd-disk-space.c -@@ -304,25 +304,41 @@ ldsm_mount_should_ignore (GUnixMountEntry *mount) - * expose this in a way that allows it to be used for this - * purpose - */ -+ -+ /* We also ignore network filesystems */ - - const gchar *ignore_fs[] = { -+ "adfs", -+ "afs", - "auto", - "autofs", -+ "autofs4", -+ "cifs", -+ "cxfs", - "devfs", - "devpts", - "ecryptfs", -+ "gfs", -+ "gfs2", - "kernfs", - "linprocfs", -+ "linsysfs", -+ "lustre", -+ "lustre_lite", -+ "ncpfs", -+ "nfs", -+ "nfs4", -+ "nfsd", -+ "ocfs2", - "proc", - "procfs", - "ptyfs", -+ "rpc_pipefs", - "selinuxfs", -- "linsysfs", -+ "smbfs", - "sysfs", - "tmpfs", - "usbfs", -- "nfsd", -- "rpc_pipefs", - "zfs", - NULL - }; --- -cgit v0.8.3.1 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch deleted file mode 100644 index 3476a9d0f286..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f7071bf1f9941f0ba5fe23c645656e70fb2dd699 Mon Sep 17 00:00:00 2001 -From: Pauli Nieminen -Date: Sat, 15 Jan 2011 19:46:34 +0000 -Subject: mouse: Use event driven mode for syndaemon - -In default polling mode syndaemon wakeups 5 times per second. That -is pretty bad for power consumption with hungry laptop CPUs. - -If syndaemon was compiled to include XRecord extension -R parameter -can be used to select even driven mode. Event driven mode wakeups -only when there is KeyPress or KeyRelease event. In that time CPU -is already running so impact for power consumption is lesser. - -Signed-off-by: Pauli Nieminen - -https://bugzilla.gnome.org/show_bug.cgi?id=639623 ---- -diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c -index 44df57f..0a9c179 100644 ---- a/plugins/mouse/gsd-mouse-manager.c -+++ b/plugins/mouse/gsd-mouse-manager.c -@@ -555,7 +555,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state) - { - if (state && touchpad_is_present ()) { - GError *error = NULL; -- char *args[5]; -+ char *args[6]; - - if (manager->priv->syndaemon_spawned) - return 0; -@@ -564,7 +564,8 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state) - args[1] = "-i"; - args[2] = "2.0"; - args[3] = "-k"; -- args[4] = NULL; -+ args[4] = "-R"; -+ args[5] = NULL; - - if (!g_find_program_in_path (args[0])) - return 0; --- -cgit v0.9 diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild deleted file mode 100644 index 9aa88ae3bbe5..000000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild,v 1.10 2013/01/22 07:37:37 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools eutils gnome2 - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="http://www.gnome.org" -SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/gnome-settings-daemon-2.32.1-gst-vol-control-support.patch" - -# Old patches: -# mirror://gentoo/${PN}-2.30.0-gst-vol-control-support.patch" -> this causes bug #327609 -# mirror://gentoo/${PN}-2.30.2-gst-vol-control-support.patch.bz2" -> this patch has worse problems like bug #339732 - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug libnotify policykit pulseaudio smartcard" - -# libgnomekbd-2.91 breaks API/ABI -COMMON_DEPEND=">=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.18:2 - >=x11-libs/gtk+-2.21.2:2 - >=gnome-base/gconf-2.6.1:2 - >=gnome-base/libgnomekbd-2.32.0-r1 - =gnome-base/gnome-desktop-2.29.92:2 - - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXext - x11-libs/libXxf86misc - >=x11-libs/libxklavier-5.0 - media-libs/fontconfig - - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - policykit? ( - >=sys-auth/polkit-0.91 - >=dev-libs/dbus-glib-0.71 - >=sys-apps/dbus-1.1.2 ) - pulseaudio? ( - >=media-sound/pulseaudio-0.9.15 - media-libs/libcanberra[gtk] ) - !pulseaudio? ( - >=media-libs/gstreamer-0.10.1.2:0.10 - >=media-libs/gst-plugins-base-0.10.1.2:0.10 ) - smartcard? ( >=dev-libs/nss-3.11.2 )" - -# 50-accessibility.xml moved to gnome-control-center in gnome-3 -RDEPEND="${COMMON_DEPEND} - !>=gnome-base/gnome-control-center-2.91.90" - -DEPEND="${COMMON_DEPEND} - !=dev-util/intltool-0.40 - virtual/pkgconfig - x11-proto/inputproto - x11-proto/xproto" - -pkg_setup() { - # README is empty - DOCS="AUTHORS NEWS ChangeLog MAINTAINERS" - G2CONF="${G2CONF} - --disable-static - $(use_enable debug) - $(use_with libnotify) - $(use_enable policykit polkit) - $(use_enable pulseaudio pulse) - $(use_enable !pulseaudio gstreamer) - $(use_enable smartcard smartcard-support)" - - if use pulseaudio; then - elog "Building volume media keys using Pulseaudio" - else - elog "Building volume media keys using GStreamer" - fi -} - -src_prepare() { - gnome2_src_prepare - - # libnotify-0.7.1 compatibility patches - epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch - epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-init.patch - - # Restore gstreamer volume control support, upstream bug #571145 - # Keep using old patch as it doesn't cause problems like bug #339732 -# epatch "${WORKDIR}/${PN}-2.30.2-gst-vol-control-support.patch" -# echo "plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c" >> po/POTFILES.in - # We use now debian patch as looks to fix bug #327609 -# epatch "${DISTDIR}/${PN}-2.30.0-gst-vol-control-support.patch" - epatch "${DISTDIR}/${PN}-2.32.1-gst-vol-control-support.patch" - - # More network filesystems not to monitor, upstream bug #606421 - epatch "${FILESDIR}/${PN}-2.32.1-netfs-monitor.patch" - - # xsettings: Export Xft.lcdfilter for OO.o's benefit, upstream bug #631924 - epatch "${FILESDIR}/${PN}-2.32.1-lcdfilter.patch" - - # media-keys: React to stream-removed signal from GvcMixerControl - epatch "${FILESDIR}/${PN}-2.32.1-media-keys-react.patch" - - # mouse: Use event driven mode for syndaemon - epatch "${FILESDIR}/${PN}-2.32.1-syndaemon-mode.patch" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! use pulseaudio; then - elog "GStreamer volume control support is a feature powered by Gentoo GNOME Team" - elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gentoo.org instead" - fi -} diff --git a/gnome-base/gnome/gnome-2.32.1-r2.ebuild b/gnome-base/gnome/gnome-2.32.1-r2.ebuild deleted file mode 100644 index 1984e3c84c67..000000000000 --- a/gnome-base/gnome/gnome-2.32.1-r2.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1-r2.ebuild,v 1.12 2013/10/04 15:03:09 tetromino Exp $ - -EAPI="4" - -DESCRIPTION="Meta package for the GNOME desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="metapackage" -SLOT="2.0" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" - -IUSE="accessibility cdr cups dvdr ldap mono policykit" - -S=${WORKDIR} - -# FIXME: bump gstreamer to 0.10.26 -# XXX: lower gdm to 2.20 since we still keep 2.28 masked -# Lower epiphany to 2.26 since 2.28 is not ready to go stable -RDEPEND="!=dev-libs/glib-2.26.1:2 - >=x11-libs/gtk+-2.22.1-r1:2 - >=x11-libs/gdk-pixbuf-2.22.1:2 - >=dev-libs/atk-1.32.0 - >=x11-libs/pango-1.28.3 - - >=dev-libs/libxml2-2.7.2:2 - >=dev-libs/libxslt-1.1.22 - - >=media-libs/audiofile-0.2.7 - >=x11-libs/libxklavier-5.0 - >=media-libs/libart_lgpl-2.3.21 - - >=dev-libs/libIDL-0.8.14 - >=gnome-base/orbit-2.14.19:2 - - >=x11-libs/libwnck-2.30.6:1 - >=x11-wm/metacity-2.30.3 - - >=gnome-base/gnome-keyring-2.32.1 - >=gnome-base/libgnome-keyring-2.32.0 - >=app-crypt/seahorse-2.32.0 - - >=gnome-base/gconf-2.32.0-r1:2 - >=net-libs/libsoup-2.32.1:2.4 - >=gnome-base/dconf-0.5.1-r2 - - >=gnome-base/libbonobo-2.24.3 - >=gnome-base/libbonoboui-2.24.4 - >=gnome-base/libgnome-2.32.0 - >=gnome-base/libgnomecanvas-2.30.2 - >=gnome-base/libglade-2.6.4:2.0 - - >=gnome-extra/bug-buddy-2.32.0:2 - >=gnome-base/libgnomekbd-2.32.0 - >=gnome-base/gnome-settings-daemon-2.32.1 - >=gnome-base/gnome-control-center-2.32.0:2 - - >=gnome-base/nautilus-2.32.1 - - >=media-libs/gstreamer-0.10.30.2:0.10 - >=media-libs/gst-plugins-base-0.10.30.4:0.10 - >=media-libs/gst-plugins-good-0.10.23:0.10 - >=gnome-extra/gnome-media-2.32.0:2 - =media-sound/sound-juicer-2.32.0 - >=dev-libs/totem-pl-parser-2.32.1 - >=media-video/totem-2.32.0 - >=media-video/cheese-2.32.0 - - >=media-gfx/eog-2.32.1:1 - - >=www-client/epiphany-2.30.6 - >=app-arch/file-roller-2.32.1 - >=gnome-extra/gcalctool-5.32.1 - - >=gnome-extra/gconf-editor-2.32.0 - >=gnome-base/gdm-2.20.11 - >=x11-libs/gtksourceview-2.10.5:2.0 - >=app-editors/gedit-2.30.4 - - >=app-text/evince-2.32.0 - - >=gnome-base/gnome-desktop-2.32.1:2 - >=gnome-base/gnome-session-2.32.1 - >=dev-libs/libgweather-2.30.3:2 - =gnome-base/gnome-applets-2.32.0 - >=gnome-base/gnome-panel-2.32.1 - >=gnome-base/gnome-menus-2.30.5 - >=x11-themes/gnome-icon-theme-2.31.0 - >=x11-themes/gnome-themes-2.32.1-r1 - >=x11-themes/gnome-themes-standard-3.0.2 - >=gnome-extra/deskbar-applet-2.32.0 - >=gnome-extra/hamster-applet-2.32.1 - - >=x11-themes/gtk-engines-2.20.2:2 - >=x11-themes/gnome-backgrounds-2.32.0 - - >=x11-libs/vte-0.26.2:0 - >=x11-terms/gnome-terminal-2.32.1 - - >=gnome-extra/gucharmap-2.32.1 - - >=gnome-extra/gnome-utils-2.32.0 - - >=gnome-extra/gnome-games-2.28.2 - >=gnome-base/librsvg-2.32.1:2 - - >=gnome-extra/gnome-system-monitor-2.28.2 - >=gnome-base/libgtop-2.28.2:2 - - >=x11-libs/startup-notification-0.10 - - >=gnome-extra/gnome-user-docs-2.32.0 - >=gnome-extra/yelp-2.30.2 - >=gnome-extra/zenity-2.32.1 - - >=net-analyzer/gnome-netstatus-2.28.2 - >=net-analyzer/gnome-nettool-2.32.0 - - cdr? ( >=app-cdr/brasero-2.32.1 ) - dvdr? ( >=app-cdr/brasero-2.32.1 ) - - >=gnome-extra/gtkhtml-3.32.1:3.14 - >=mail-client/evolution-2.32.1-r1:2.0 - >=gnome-extra/evolution-data-server-2.32.1-r1 - >=gnome-extra/evolution-webcal-2.32.0 - - >=net-misc/vino-2.32.0 - - >=app-admin/pessulus-2.30.4 - ldap? ( >=app-admin/sabayon-2.30.1 ) - - >=gnome-extra/gnome-screensaver-2.30.2 - >=x11-misc/alacarte-0.13.2 - >=gnome-extra/gnome-power-manager-2.32.0 - - >=net-misc/vinagre-2.30.3 - - accessibility? ( - >=gnome-extra/libgail-gnome-1.20.3 - >=gnome-extra/at-spi-1.32.0:1 - >=app-accessibility/dasher-4.11 - >=app-accessibility/gnome-mag-0.16.3:1 - >=app-accessibility/gnome-speech-0.4.25:1 - >=app-accessibility/gok-2.30.1:1 - >=app-accessibility/orca-2.32.1 - >=gnome-extra/mousetweaks-2.32.1 ) - cups? ( >=app-admin/system-config-printer-gnome-1.3.3 ) - - mono? ( - >=dev-dotnet/gtk-sharp-2.12.10:2 - >=app-misc/tomboy-1.4.2 ) - policykit? ( gnome-extra/polkit-gnome )" -DEPEND="" -PDEPEND="|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )" -# Broken from assumptions of gnome-vfs headers being included in nautilus headers, -# which isn't the case with nautilus-2.22, bug #216019 -# >=app-admin/gnome-system-tools-2.32.0 -# >=app-admin/system-tools-backends-2.8 - -# Development tools -# scrollkeeper -# pkgconfig -# intltool -# gtk-doc -# gnome-doc-utils - -pkg_postinst() { -# FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway -# FIXME: but first check WINDOW_MANAGER is still honored in 2.24. gnome-session-2.24 might have lost -# FIXME: support for it, but we don't ship with gnome-session-2.24 yet -# elog "Note that to change windowmanager to metacity do: " -# elog " export WINDOW_MANAGER=\"/usr/bin/metacity\"" -# elog "of course this works for all other window managers as well" - - elog "The main file alteration monitoring functionality is" - elog "provided by >=glib-2.16. Note that on a modern Linux system" - elog "you do not need the USE=fam flag on it if you have inotify" - elog "support in your linux kernel ( >=2.6.13 ) enabled." - elog "USE=fam on glib is however useful for other situations," - elog "such as Gentoo/FreeBSD systems. A global USE=fam can also" - elog "be useful for other packages that do not use the new file" - elog "monitoring API yet that the new glib provides." - elog -} diff --git a/gnome-base/gnome/gnome-3.10.0.ebuild b/gnome-base/gnome/gnome-3.10.0.ebuild deleted file mode 100644 index b37210f79eba..000000000000 --- a/gnome-base/gnome/gnome-3.10.0.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.10.0.ebuild,v 1.6 2014/07/05 09:22:08 klausman Exp $ - -EAPI="5" - -DESCRIPTION="Meta package for GNOME 3, merge this package to install" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="metapackage" -SLOT="2.0" # Cannot be installed at the same time as gnome-2 - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -IUSE="accessibility +bluetooth +classic +cdr cups +extras" - -S=${WORKDIR} - -# TODO: check accessibility completeness -# GDM-3.0 integrates very nicely with GNOME Shell -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV}[cups?] - >=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?] - - >=gnome-base/gdm-${PV} - - >=x11-wm/mutter-${PV} - >=gnome-base/gnome-shell-${PV}[bluetooth?] - - >=x11-themes/gnome-backgrounds-${PV} - >=x11-themes/gnome-icon-theme-extras-3.6.2 - x11-themes/sound-theme-freedesktop - - accessibility? ( - >=app-accessibility/at-spi2-atk-2.10 - >=app-accessibility/at-spi2-core-2.10 - >=app-accessibility/caribou-0.4.13 - >=app-accessibility/orca-${PV} - >=gnome-extra/mousetweaks-${PV} ) - classic? ( >=gnome-extra/gnome-shell-extensions-${PV} ) - extras? ( >=gnome-base/gnome-extra-apps-${PV} ) -" - -DEPEND="" - -PDEPEND="|| ( >=gnome-base/gvfs-1.18[udisks] >=gnome-base/gvfs-1.18[gdu] )" - -# Broken from assumptions of gnome-vfs headers being included in nautilus headers, -# which isn't the case with nautilus-2.22, bug #216019 -# >=app-admin/gnome-system-tools-2.32.0 -# >=app-admin/system-tools-backends-2.8 - -# Not ported: -# bug-buddy-2.32 -# sound-juicer-2.32 -# -# Not ported, don't build: -# gnome-extra/evolution-webcal-2.32.0 - -# These don't work with gsettings/dconf -# >=app-admin/pessulus-2.30.4 -# ldap? ( >=app-admin/sabayon-2.30.1 ) - -# I'm not sure what all is in a11y for GNOME 3 yet ~nirbheek -# accessibility? ( -# >=gnome-extra/libgail-gnome-1.20.3 -# >=gnome-extra/at-spi-1.32.0:1 -# >=app-accessibility/dasher-4.11 -# >=app-accessibility/gnome-mag-0.16.3:1 -# >=app-accessibility/gnome-speech-0.4.25:1 -# >=app-accessibility/gok-2.30.1:1 -# >=app-accessibility/orca-2.32.1 -# >=gnome-extra/mousetweaks-2.32.1 ) - -# Useless with GNOME Shell -# >=gnome-extra/deskbar-applet-2.32.0 -# >=gnome-extra/hamster-applet-2.32.1 - -# Development tools -# scrollkeeper -# pkgconfig -# intltool -# gtk-doc -# gnome-doc-utils -# itstool -# yelp-tools diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest index 7c3b7ef97dca..844e075bdba9 100644 --- a/gnome-base/libgnome-keyring/Manifest +++ b/gnome-base/libgnome-keyring/Manifest @@ -1,2 +1 @@ -DIST libgnome-keyring-2.32.0.tar.bz2 412592 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c SHA512 e143d470484e06152741f0ae5266b36b69062bed268066b612eac66a20e38d7b7613896eff9a76933abef8a631bbcb1629532202e443dda46c800460602ddab4 WHIRLPOOL afb3c852d980dd05ad9f4b3490582de2eba0e4967b5b7bcd82cbe0cd47f0a712dd40c9b80da8ca4a6ab054a719198496c9887b69d2b506c0c5a736d10d41d15b DIST libgnome-keyring-3.12.0.tar.xz 435092 SHA256 c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd WHIRLPOOL 8494913559cf057a77457bdafdff90099075421e88fa247e0215bd0dbb3f79ef41552c5825cfb99857b4f1bf9bc9d677facca779f9d6ed0892eabe9291e0d9a5 diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-drop-test.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-drop-test.patch deleted file mode 100644 index 9cbd156cfb54..000000000000 --- a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-drop-test.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 987f84c13bac6032164616b220289b5824bbd6a2 Mon Sep 17 00:00:00 2001 -From: Stef Walter -Date: Wed, 19 Jan 2011 19:44:39 +0000 -Subject: Remove unneeded test file. - ---- -diff --git a/library/tests/Makefile.am b/library/tests/Makefile.am -index 9514c47..0a54cc7 100644 ---- a/library/tests/Makefile.am -+++ b/library/tests/Makefile.am -@@ -2,16 +2,12 @@ - TEST_AUTO = \ - test-memory.c \ - test-keyrings.c \ -- test-other.c \ -- test-daemon-setup.c -+ test-other.c - - TEST_LIBS = \ - $(top_builddir)/egg/libegg.la \ - $(top_builddir)/library/libgnome-keyring.la - --TEST_FLAGS = \ -- -DTEST_WITH_DAEMON -- - include $(top_srcdir)/tests/gtest.make - - # ------------------------------------------------------------------ -diff --git a/library/tests/test-daemon-setup.c b/library/tests/test-daemon-setup.c -deleted file mode 100644 -index 077656d..0000000 ---- a/library/tests/test-daemon-setup.c -+++ b/dev/null -@@ -1,86 +0,0 @@ --/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ --/* unit-test-daemon-setup.c: Start a gnome-keyring-daemon process for testing -- -- Copyright (C) 2007 Stefan Walter -- -- The Gnome Keyring Library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Library General Public License as -- published by the Free Software Foundation; either version 2 of the -- License, or (at your option) any later version. -- -- The Gnome Keyring Library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -- -- You should have received a copy of the GNU Library General Public -- License along with the Gnome Library; see the file COPYING.LIB. If not, -- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -- Boston, MA 02111-1307, USA. -- -- Author: Stef Walter --*/ -- --#include --#include --#include --#include --#include -- --#include "run-auto-test.h" -- --#include "library/gnome-keyring.h" -- --#if 0 --static GPid daemon_pid; --#endif -- --DEFINE_START(setup_daemon) --{ --#if 0 -- GError *err = NULL; -- gchar *args[3]; -- const gchar *outside, *path; -- gboolean start = FALSE; -- gchar *socket; -- -- /* If already setup somewhere else, then don't start daemon here */ -- outside = g_getenv ("GNOME_KEYRING_OUTSIDE_TEST"); -- if (!outside || !outside[0]) -- start = TRUE; -- -- path = g_getenv ("GNOME_KEYRING_TEST_PATH"); -- g_assert (path && path[0]); -- -- socket = g_strdup_printf ("%s/socket", path); -- g_setenv ("GNOME_KEYRING_SOCKET", socket, TRUE); -- -- if (!start) -- return; -- -- g_printerr ("Starting gnome-keyring-daemon...\n"); -- -- args[0] = "../../daemon/gnome-keyring-daemon"; -- args[1] = "-f"; -- args[2] = NULL; -- -- if (!g_spawn_async (NULL, args, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN | G_SPAWN_DO_NOT_REAP_CHILD, -- NULL, NULL, &daemon_pid, &err)) { -- g_error ("couldn't start gnome-keyring-daemon for testing: %s", -- err && err->message ? err->message : ""); -- g_assert_not_reached (); -- } -- -- /* Let it startup properly */ -- sleep (2); --#endif --} -- --DEFINE_STOP(setup_daemon) --{ --#if 0 -- if (daemon_pid) -- kill (daemon_pid, SIGTERM); -- /* We're exiting soon anyway, no need to wait */ --#endif --} --- -cgit v0.9.0.2 diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-hang-tests.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-hang-tests.patch deleted file mode 100644 index 405838913f85..000000000000 --- a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-hang-tests.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: libgnome-keyring-2.32.0/egg/tests/test-dh.c -=================================================================== ---- libgnome-keyring-2.32.0.orig/egg/tests/test-dh.c -+++ libgnome-keyring-2.32.0/egg/tests/test-dh.c -@@ -27,6 +27,7 @@ - - #include "run-auto-test.h" - -+#include "egg-libgcrypt.h" - #include "egg-dh.h" - #include "egg-secure-memory.h" - -@@ -39,7 +40,7 @@ DEFINE_TEST(dh_perform) - gcry_mpi_t x2, X2; - gpointer k1, k2; - gboolean ret; -- -+ egg_libgcrypt_initialize (); - /* Load up the parameters */ - if (!egg_dh_default_params ("ietf-ike-grp-modp-768", &p, &g)) - g_assert_not_reached (); diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-run-test.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-run-test.patch deleted file mode 100644 index efc47df7f2e6..000000000000 --- a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-run-test.patch +++ /dev/null @@ -1,87 +0,0 @@ -From ffbaa40603ed33646de10822983c9445d6c70d3a Mon Sep 17 00:00:00 2001 -From: Stef Walter -Date: Wed, 19 Jan 2011 19:44:50 +0000 -Subject: Don't run tests if a testing enabled gnome-keyring-daemon is not enabled. - -This uses the 'gnome-keyring-daemon --version' output to determine -whether testing is enabled or not. ---- -diff --git a/tests/gtest-helpers.c b/tests/gtest-helpers.c -index fbdb5d7..e984f64 100644 ---- a/tests/gtest-helpers.c -+++ b/tests/gtest-helpers.c -@@ -160,16 +160,17 @@ chdir_base_dir (char* argv0) - g_free (dir); - } - --#ifdef TEST_WITH_DAEMON -- - static pid_t daemon_pid = 0; - - static gboolean --daemon_start () -+daemon_start (void) - { - GError *err = NULL; - gchar *args[5]; - const gchar *path, *service, *address; -+ gchar *output = NULL; -+ gint exit_status = 1; -+ GError *error = NULL; - - /* Need to have DBUS running */ - address = g_getenv ("DBUS_SESSION_BUS_ADDRESS"); -@@ -178,6 +179,23 @@ daemon_start () - return FALSE; - } - -+ /* Check if gnome-keyring-daemon has testing enabled */ -+ if (!g_spawn_command_line_sync (GNOME_KEYRING_DAEMON_PATH " --version", -+ &output, NULL, &exit_status, &error)) { -+ g_printerr ("Couldn't launch '%s': %s", GNOME_KEYRING_DAEMON_PATH, -+ error->message); -+ return FALSE; -+ } -+ -+ /* For some reason --version failed */ -+ if (exit_status != 0 || strstr (output, "testing: enabled") == NULL) { -+ g_printerr ("Skipping tests since no testing enabled gnome-keyring-daemin is available\n"); -+ g_free (output); -+ return FALSE; -+ } -+ -+ g_free (output); -+ - path = g_getenv ("GNOME_KEYRING_TEST_PATH"); - if (path && !path[0]) - path = NULL; -@@ -221,8 +239,6 @@ daemon_stop (void) - daemon_pid = 0; - } - --#endif /* TEST_WITH_DAEMON */ -- - int - main (int argc, char* argv[]) - { -@@ -239,18 +255,12 @@ main (int argc, char* argv[]) - - initialize_tests (); - --#ifdef TEST_WITH_DAEMON - if (daemon_start ()) { --#endif -- - start_tests (); - ret = g_test_run (); - stop_tests(); -- --#ifdef TEST_WITH_DAEMON - daemon_stop(); - } --#endif - - return ret; - } --- -cgit v0.9.0.2 diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild deleted file mode 100644 index 99350bd31168..000000000000 --- a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild +++ /dev/null @@ -1,61 +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/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.17 2012/12/17 04:46:05 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit gnome2 eutils autotools - -DESCRIPTION="Compatibility library for accessing secrets" -HOMEPAGE="http://live.gnome.org/GnomeKeyring" - -LICENSE="LGPL-2+ GPL-2+" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris" -IUSE="debug test" - -RDEPEND=">=sys-apps/dbus-1.0 - >=gnome-base/gnome-keyring-2.29[test?] - ! -Date: Thu, 30 Sep 2010 00:50:44 +0000 -Subject: Remove GDK_DISPLAY() usage - -https://bugzilla.gnome.org/show_bug.cgi?id=630974 ---- -diff --git a/capplet/gkbd-indicator-plugins-capplet.c b/capplet/gkbd-indicator-plugins-capplet.c -index c232c98..752d28c 100644 ---- a/capplet/gkbd-indicator-plugins-capplet.c -+++ b/capplet/gkbd-indicator-plugins-capplet.c -@@ -376,7 +376,7 @@ main (int argc, char **argv) - } - gconf_error = NULL; - /*GkbdIndicatorInstallGlibLogAppender( ); */ -- gipc.engine = xkl_engine_get_instance (GDK_DISPLAY ()); -+ gipc.engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); - gipc.config_registry = - xkl_config_registry_get_instance (gipc.engine); - -diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c -index cb2ed56..4fd42d8 100644 ---- a/libgnomekbd/gkbd-indicator.c -+++ b/libgnomekbd/gkbd-indicator.c -@@ -817,7 +817,7 @@ gkbd_indicator_global_init (void) - GConfClient *gconf_client; - XklConfigRec *xklrec = xkl_config_rec_new (); - -- globals.engine = xkl_engine_get_instance (GDK_DISPLAY ()); -+ globals.engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); - if (globals.engine == NULL) { - xkl_debug (0, "Libxklavier initialization error"); - return; -diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c -index 7e3c3e8..e31dc94 100644 ---- a/libgnomekbd/gkbd-keyboard-drawing.c -+++ b/libgnomekbd/gkbd-keyboard-drawing.c -@@ -2524,7 +2524,7 @@ gkbd_keyboard_drawing_new_dialog (gint group, gchar * group_name) - GdkRectangle *rect; - GError *error = NULL; - char title[128] = ""; -- XklEngine *engine = xkl_engine_get_instance (GDK_DISPLAY ()); -+ XklEngine *engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); - - builder = gtk_builder_new (); - gtk_builder_add_from_file (builder, UIDIR "/show-layout.ui", -diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c -index 83a5d47..c6ac2d6 100644 ---- a/libgnomekbd/gkbd-status.c -+++ b/libgnomekbd/gkbd-status.c -@@ -771,7 +771,7 @@ gkbd_status_global_init (void) - GConfClient *gconf_client; - XklConfigRec *xklrec = xkl_config_rec_new (); - -- globals.engine = xkl_engine_get_instance (GDK_DISPLAY ()); -+ globals.engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); - if (globals.engine == NULL) { - xkl_debug (0, "Libxklavier initialization error"); - return; --- -cgit v0.9.0.2 diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkkeyname-replace.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkkeyname-replace.patch deleted file mode 100644 index 3a9070ade1b4..000000000000 --- a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkkeyname-replace.patch +++ /dev/null @@ -1,231 +0,0 @@ -From f05774eace6d681b0fc59b2abee650b847fff8a1 Mon Sep 17 00:00:00 2001 -From: William Jon McCann -Date: Thu, 30 Sep 2010 00:46:20 +0000 -Subject: Replace GDK_keyname with GDK_KEY_keyname - -https://bugzilla.gnome.org/show_bug.cgi?id=630974 ---- -diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c -index 4fd42d8..89ed92a 100644 ---- a/libgnomekbd/gkbd-indicator.c -+++ b/libgnomekbd/gkbd-indicator.c -@@ -233,12 +233,12 @@ gkbd_indicator_key_pressed (GtkWidget * - GkbdIndicator * gki) - { - switch (event->keyval) { -- case GDK_KP_Enter: -- case GDK_ISO_Enter: -- case GDK_3270_Enter: -- case GDK_Return: -- case GDK_space: -- case GDK_KP_Space: -+ case GDK_KEY_KP_Enter: -+ case GDK_KEY_ISO_Enter: -+ case GDK_KEY_3270_Enter: -+ case GDK_KEY_Return: -+ case GDK_KEY_space: -+ case GDK_KEY_KP_Space: - gkbd_desktop_config_lock_next_group (&globals.cfg); - return TRUE; - default: -diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c -index e31dc94..3de2125 100644 ---- a/libgnomekbd/gkbd-keyboard-drawing.c -+++ b/libgnomekbd/gkbd-keyboard-drawing.c -@@ -620,147 +620,147 @@ set_key_label_in_layout (GkbdKeyboardDrawingRenderContext * context, - PangoLayout *layout = context->layout; - - switch (keyval) { -- case GDK_Scroll_Lock: -+ case GDK_KEY_Scroll_Lock: - pango_layout_set_text (layout, "Scroll\nLock", -1); - break; - -- case GDK_space: -+ case GDK_KEY_space: - pango_layout_set_text (layout, "", -1); - break; - -- case GDK_Sys_Req: -+ case GDK_KEY_Sys_Req: - pango_layout_set_text (layout, "Sys Rq", -1); - break; - -- case GDK_Page_Up: -+ case GDK_KEY_Page_Up: - pango_layout_set_text (layout, "Page\nUp", -1); - break; - -- case GDK_Page_Down: -+ case GDK_KEY_Page_Down: - pango_layout_set_text (layout, "Page\nDown", -1); - break; - -- case GDK_Num_Lock: -+ case GDK_KEY_Num_Lock: - pango_layout_set_text (layout, "Num\nLock", -1); - break; - -- case GDK_KP_Page_Up: -+ case GDK_KEY_KP_Page_Up: - pango_layout_set_text (layout, "Pg Up", -1); - break; - -- case GDK_KP_Page_Down: -+ case GDK_KEY_KP_Page_Down: - pango_layout_set_text (layout, "Pg Dn", -1); - break; - -- case GDK_KP_Home: -+ case GDK_KEY_KP_Home: - pango_layout_set_text (layout, "Home", -1); - break; - -- case GDK_KP_Left: -+ case GDK_KEY_KP_Left: - pango_layout_set_text (layout, "Left", -1); - break; - -- case GDK_KP_End: -+ case GDK_KEY_KP_End: - pango_layout_set_text (layout, "End", -1); - break; - -- case GDK_KP_Up: -+ case GDK_KEY_KP_Up: - pango_layout_set_text (layout, "Up", -1); - break; - -- case GDK_KP_Begin: -+ case GDK_KEY_KP_Begin: - pango_layout_set_text (layout, "Begin", -1); - break; - -- case GDK_KP_Right: -+ case GDK_KEY_KP_Right: - pango_layout_set_text (layout, "Right", -1); - break; - -- case GDK_KP_Enter: -+ case GDK_KEY_KP_Enter: - pango_layout_set_text (layout, "Enter", -1); - break; - -- case GDK_KP_Down: -+ case GDK_KEY_KP_Down: - pango_layout_set_text (layout, "Down", -1); - break; - -- case GDK_KP_Insert: -+ case GDK_KEY_KP_Insert: - pango_layout_set_text (layout, "Ins", -1); - break; - -- case GDK_KP_Delete: -+ case GDK_KEY_KP_Delete: - pango_layout_set_text (layout, "Del", -1); - break; - -- case GDK_dead_grave: -+ case GDK_KEY_dead_grave: - pango_layout_set_text (layout, "ˋ", -1); - break; - -- case GDK_dead_acute: -+ case GDK_KEY_dead_acute: - pango_layout_set_text (layout, "ˊ", -1); - break; - -- case GDK_dead_circumflex: -+ case GDK_KEY_dead_circumflex: - pango_layout_set_text (layout, "ˆ", -1); - break; - -- case GDK_dead_tilde: -+ case GDK_KEY_dead_tilde: - pango_layout_set_text (layout, "~", -1); - break; - -- case GDK_dead_macron: -+ case GDK_KEY_dead_macron: - pango_layout_set_text (layout, "ˉ", -1); - break; - -- case GDK_dead_breve: -+ case GDK_KEY_dead_breve: - pango_layout_set_text (layout, "˘", -1); - break; - -- case GDK_dead_abovedot: -+ case GDK_KEY_dead_abovedot: - pango_layout_set_text (layout, "˙", -1); - break; - -- case GDK_dead_diaeresis: -+ case GDK_KEY_dead_diaeresis: - pango_layout_set_text (layout, "¨", -1); - break; - -- case GDK_dead_abovering: -+ case GDK_KEY_dead_abovering: - pango_layout_set_text (layout, "˚", -1); - break; - -- case GDK_dead_doubleacute: -+ case GDK_KEY_dead_doubleacute: - pango_layout_set_text (layout, "˝", -1); - break; - -- case GDK_dead_caron: -+ case GDK_KEY_dead_caron: - pango_layout_set_text (layout, "ˇ", -1); - break; - -- case GDK_dead_cedilla: -+ case GDK_KEY_dead_cedilla: - pango_layout_set_text (layout, "¸", -1); - break; - -- case GDK_dead_ogonek: -+ case GDK_KEY_dead_ogonek: - pango_layout_set_text (layout, "˛", -1); - break; - -- /* case GDK_dead_iota: -- * case GDK_dead_voiced_sound: -- * case GDK_dead_semivoiced_sound: */ -+ /* case GDK_KEY_dead_iota: -+ * case GDK_KEY_dead_voiced_sound: -+ * case GDK_KEY_dead_semivoiced_sound: */ - -- case GDK_dead_belowdot: -+ case GDK_KEY_dead_belowdot: - pango_layout_set_text (layout, " ̣", -1); - break; - -- case GDK_horizconnector: -+ case GDK_KEY_horizconnector: - pango_layout_set_text (layout, "horiz\nconn", -1); - break; - -- case GDK_Mode_switch: -+ case GDK_KEY_Mode_switch: - pango_layout_set_text (layout, "AltGr", -1); - break; - -- case GDK_Multi_key: -+ case GDK_KEY_Multi_key: - pango_layout_set_text (layout, "Compose", -1); - break; - -@@ -2037,7 +2037,7 @@ gkbd_keyboard_drawing_init (GkbdKeyboardDrawing * drawing) - - XkbGetNames (drawing->display, XkbAllNamesMask, drawing->xkb); - drawing->l3mod = XkbKeysymToModifiers (drawing->display, -- GDK_ISO_Level3_Shift); -+ GDK_KEY_ISO_Level3_Shift); - - drawing->xkbOnDisplay = TRUE; - --- -cgit v0.9.0.2 diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-unneeded-casts.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-unneeded-casts.patch deleted file mode 100644 index 44bc3a972bd1..000000000000 --- a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-unneeded-casts.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b1079544e9585ee01b31b6e882afceb4aac938da Mon Sep 17 00:00:00 2001 -From: Sergey V. Udaltsov -Date: Thu, 30 Sep 2010 07:21:27 +0000 -Subject: Unneeded casts removed - ---- -diff --git a/capplet/gkbd-indicator-plugins-capplet.c b/capplet/gkbd-indicator-plugins-capplet.c -index 9058fbc..c232c98 100644 ---- a/capplet/gkbd-indicator-plugins-capplet.c -+++ b/capplet/gkbd-indicator-plugins-capplet.c -@@ -305,13 +305,13 @@ CappletSetup (GkbdIndicatorPluginsCapplet * gipc) - gtk_builder_connect_signals (builder, NULL); - - g_object_set_data (G_OBJECT (capplet), "uiData", builder); -- g_signal_connect_swapped (GTK_OBJECT (capplet), -+ g_signal_connect_swapped (capplet, - "destroy", G_CALLBACK (g_object_unref), - builder); - g_signal_connect_swapped (G_OBJECT (capplet), "unrealize", - G_CALLBACK (g_main_loop_quit), loop); - -- g_signal_connect (GTK_OBJECT (capplet), -+ g_signal_connect (capplet, - "response", G_CALLBACK (CappletResponse), NULL); - - button = GTK_WIDGET (gtk_builder_get_object (builder, "btnUp")); -diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c -index 909930b..7e3c3e8 100644 ---- a/libgnomekbd/gkbd-keyboard-drawing.c -+++ b/libgnomekbd/gkbd-keyboard-drawing.c -@@ -2614,7 +2614,7 @@ gkbd_keyboard_drawing_new_dialog (gint group, gchar * group_name) - - g_object_set_data (G_OBJECT (dialog), "kbdraw", kbdraw); - -- g_signal_connect_swapped (GTK_OBJECT (dialog), "destroy", -+ g_signal_connect_swapped (dialog, "destroy", - G_CALLBACK (g_object_unref), - g_object_get_data (G_OBJECT (dialog), - "builderData")); --- -cgit v0.9.0.2 diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild deleted file mode 100644 index b66fc01fc04c..000000000000 --- a/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild +++ /dev/null @@ -1,45 +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/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild,v 1.4 2012/05/21 18:57:27 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit eutils gnome2 - -DESCRIPTION="Gnome keyboard configuration library" -HOMEPAGE="http://www.gnome.org" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="test" - -# gtk+-2.20 needed for tests -RDEPEND=">=dev-libs/glib-2.18:2 - >=gnome-base/gconf-2.14:2 - >=x11-libs/gtk+-2.20:2 - >=x11-libs/libxklavier-5.0" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35 - virtual/pkgconfig" - -pkg_setup() { - G2CONF="${G2CONF} $(use_enable test tests) --disable-static" - DOCS="AUTHORS ChangeLog NEWS README" -} - -src_prepare() { - gnome2_src_prepare - - # Unneeded casts removed - epatch "${FILESDIR}/${P}-unneeded-casts.patch" - - # Remove GDK_DISPLAY() usage - epatch "${FILESDIR}/${P}-gdkdisplay-usage.patch" - - # Replace GDK_keyname with GDK_KEY_keyname - epatch "${FILESDIR}/${P}-gdkkeyname-replace.patch" -} diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index bcf8c523fbbc..655a4ab3ac38 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,5 +1 @@ -DIST nautilus-2.32.2.1-patches.tar.bz2 6984 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb SHA512 9c18c24001cc3cbf91242845f13bbe44160b85286ab82e29083e06905a0d278a5e9e554dc1e09445490fa723677d4beb080f2d23b934386b8de7704f8bb7e417 WHIRLPOOL d875e319a00288aa46d55c7edee5b1c53ff854ab41f73a4135a5f993e83f658da0b190d44d27fc9d4277de783f55e4e3f9ed3fede444b4b06384a8216a1d087b -DIST nautilus-2.32.2.1.tar.bz2 6350203 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303 SHA512 cb9d65d16c8d771d182bb94d9de59c4054b05603b8ad33beeca26b41c3ca3c84581b596625f6503924c4a26f5ca1218c6d1e81c9d94e6cc637a3e8a941cde9b4 WHIRLPOOL c98d2750f5b32896c67d1fc6060e1c288296a4a86142fa35eb261f8630fdd92ad974cf3bd66d3843f0073c7ec96081afd01063c4c2d10d70059efc58da9a2fa0 -DIST nautilus-3.10.1.tar.xz 3334432 SHA256 f6a532a170907d116e8ce55847c5c6cd4e03819f5f818087554f2ec2556fc727 SHA512 a201d661104025b4b5ef4d0aa8ba7d083bb60e164c948e9932a78967f4046cc6e3afe7dcd5d20cfb99f500c4561555022cce4c39f2acc72370a515141798e90c WHIRLPOOL f9ab9305ea528233f1e318b2b96323d4568ac2c7880921a4700b01fc7510bd447bcfb90091655dd02f850cf508211d8abbaea5321c16ea62d2876175726900f8 -DIST nautilus-3.12.0.tar.xz 3350956 SHA256 c19af20ab1fadf04bebee7ec8d3375c5efbe27bb6e0b7d3a60369523baf5e4df SHA512 e42eef48564c8b1fd0cb1cadee285be0c8b1e0840527498f4e4e2d25719d31d3dc1c780cd09e521f187ed98502e0b223aaac589ca22bdc6a4e3bd4c3495feb7d WHIRLPOOL a6a41a4134874efc5b36f992f00b6d0aca14659ad6747dd0ce760ee20458982094b3cf525d83c6df8376a93b3d4ef8667d2f03abb2f9f91097312804a024724a DIST nautilus-3.12.2.tar.xz 4975580 SHA256 969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1 SHA512 59a80fef3cedff5393061aeead552eec80bbd920ae71b918bb21ca6fc59ba1c4e85c641885a12dde5208345b8659f9d4a6e1ddf865f4cb94afd5a3a339839c01 WHIRLPOOL cc9369b606ee4c6727aba89240a17ef007e26c1c5c6cc54a92cb83d098a51ac1424431462125ba56564cad9e26023c489ada96ff5e6037eaf49537b9e76e49fe diff --git a/gnome-base/nautilus/files/nautilus-2.32.2.1-gold-glib2.32.patch b/gnome-base/nautilus/files/nautilus-2.32.2.1-gold-glib2.32.patch deleted file mode 100644 index 86c66ec7604f..000000000000 --- a/gnome-base/nautilus/files/nautilus-2.32.2.1-gold-glib2.32.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.in b/configure.in -index 97e171e..4cf7827 100644 ---- a/configure.in -+++ b/configure.in -@@ -336,7 +336,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`" - AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS) - - dnl core nautilus --CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES" -+CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gmodule-no-export-2.0 gio-2.0 gio-unix-2.0 unique-1.0 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES" - CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags" - AC_SUBST(CORE_CFLAGS) - CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" diff --git a/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild deleted file mode 100644 index 1dba0db37c6c..000000000000 --- a/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild +++ /dev/null @@ -1,84 +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/nautilus/nautilus-2.32.2.1-r2.ebuild,v 1.9 2012/12/20 16:27:56 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools eutils gnome2 virtualx - -DESCRIPTION="A file manager for the GNOME desktop" -HOMEPAGE="http://live.gnome.org/Nautilus" - -SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2" - -LICENSE="GPL-2+ LGPL-2+ FDL-1.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux" -IUSE="gnome +introspection xmp" - -RDEPEND=">=dev-libs/glib-2.28.0:2 - >=gnome-base/gnome-desktop-2.29.91:2 - >=x11-libs/pango-1.1.2 - >=x11-libs/gtk+-2.22:2[introspection?] - >=dev-libs/libxml2-2.4.7:2 - >=media-libs/libexif-0.5.12 - >=gnome-base/gconf-2:2 - dev-libs/libunique:1 - gnome-base/dconf - x11-libs/libXext - x11-libs/libXrender - introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) - xmp? ( media-libs/exempi:2 )" - -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - sys-devel/gettext - virtual/pkgconfig - dev-util/gtk-doc-am - >=dev-util/intltool-0.40.1" -# For eautoreconf -# gnome-base/gnome-common - -PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 ) - >=gnome-base/gvfs-0.1.2" - -src_prepare() { - G2CONF="${G2CONF} - --disable-update-mimedb - --disable-packagekit - $(use_enable introspection) - $(use_enable xmp)" - DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO" - - # Apply multiple upstream fixes - epatch "${WORKDIR}/${P}-patches"/*.patch - - # build failure with ld.gold, fixed in 3.4 - epatch "${FILESDIR}/${P}-gold-glib2.32.patch" - eautoreconf - - gnome2_src_prepare -} - -src_test() { - addpredict "/root/.gnome2_private" - unset SESSION_MANAGER - unset ORBIT_SOCKETDIR - unset DBUS_SESSION_BUS_ADDRESS - Xemake check || die "Test phase failed" -} - -src_install() { - gnome2_src_install - find "${ED}" -name "*.la" -delete || die "remove of la files failed" -} - -pkg_postinst() { - gnome2_pkg_postinst - - elog "nautilus can use gstreamer to preview audio files. Just make sure" - elog "to have the necessary plugins available to play the media type you" - elog "want to preview" -} diff --git a/gnome-base/nautilus/nautilus-3.10.1.ebuild b/gnome-base/nautilus/nautilus-3.10.1.ebuild deleted file mode 100644 index d4c2526191ae..000000000000 --- a/gnome-base/nautilus/nautilus-3.10.1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.10.1.ebuild,v 1.4 2014/03/09 11:59:25 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" # Needed with USE 'sendto' - -inherit eutils gnome2 readme.gentoo virtualx - -DESCRIPTION="A file manager for the GNOME desktop" -HOMEPAGE="http://live.gnome.org/Nautilus" - -LICENSE="GPL-2+ LGPL-2+ FDL-1.1" -SLOT="0" - -# profiling? -IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux" - -# FIXME: tests fails under Xvfb, but pass when building manually -# "FAIL: check failed in nautilus-file.c, line 8307" -RESTRICT="test" - -# FIXME: selinux support is automagic -# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 -# and 2.30.0 -COMMON_DEPEND=" - >=dev-libs/glib-2.35.3:2 - >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.9.11:3[introspection?] - >=dev-libs/libxml2-2.7.8:2 - >=gnome-base/gnome-desktop-3:3= - - gnome-base/dconf - >=gnome-base/gsettings-desktop-schemas-3.8.0 - >=x11-libs/libnotify-0.7:= - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - - exif? ( >=media-libs/libexif-0.6.20 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) - tracker? ( >=app-misc/tracker-0.16:= ) - xmp? ( >=media-libs/exempi-2.1.0 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 - >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-am-1.4 - >=dev-util/intltool-0.40.1 - sys-devel/gettext - virtual/pkgconfig - x11-proto/xproto -" -RDEPEND="${COMMON_DEPEND} - packagekit? ( app-admin/packagekit-base ) - sendto? ( !description); -+ } -+ - g_error ("Accessibility app error: exception during " -- "registry activation from id: %s\n", -- CORBA_exception_id (&ev)); -+ "registry activation from id: %s\n" -+ "Error description: %s\n", id, err_desc == NULL ? "-" : err_desc); -+ - CORBA_exception_free (&ev); -+ if (err_desc != NULL) -+ g_free (err_desc); - } - - if (registry_died && registry) -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/test/Makefile.am at-spi-1.19.3/test/Makefile.am ---- at-spi-1.19.3.orig/test/Makefile.am 2007-05-22 05:40:43.000000000 -0400 -+++ at-spi-1.19.3/test/Makefile.am 2007-06-04 13:31:11.000000000 -0400 -@@ -37,11 +37,18 @@ INCLUDES = -I$(top_srcdir) \ - $(TESTS_CFLAGS) \ - $(DEBUG_CFLAGS) - --LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS) -+LDADD = ../libspi/libspi.la ../cspi/libcspi.la ../login-helper/libloginhelper.la ../atk-bridge/libatk-bridge.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS) - - TESTS = test-simple - - TESTS_ENVIRONMENT = \ -- LD_LIBRARY_PATH=$(top_builddir)/libspi/.libs/:$(top_builddir)/cspi/.libs/ \ -- PATH=$(top_builddir)/registryd/.libs/:$(PATH) -+ BONOBO_ACTIVATION_PATH=$(top_builddir)/test -+ -+BUILT_SOURCES = Accessibility_Registry.server -+ -+Accessibility_Registry.server: -+ rm -f Accessibility_Registry.server -+ sed -e "s,@REGISTRYD_PATH\@,`which libtool` --mode=execute `pwd`/../registryd,g" \ -+ $(top_builddir)/registryd/Accessibility_Registry.server.in.in > \ -+ Accessibility_Registry.server - -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN at-spi-1.19.3.orig/test/test-simple.c at-spi-1.19.3/test/test-simple.c ---- at-spi-1.19.3.orig/test/test-simple.c 2007-01-09 22:08:21.000000000 -0500 -+++ at-spi-1.19.3/test/test-simple.c 2007-06-04 13:29:46.000000000 -0400 -@@ -714,7 +714,7 @@ test_keylisteners (void) - key_listener = SPI_createAccessibleKeystrokeListener ( - key_listener_cb, &stroke); - -- test_keyset = SPI_createAccessibleKeySet (1, "=", NULL, NULL); -+ test_keyset = SPI_createAccessibleKeySet (1, "t", NULL, NULL); - - g_assert (SPI_registerAccessibleKeystrokeListener ( - key_listener, -@@ -725,11 +725,11 @@ test_keylisteners (void) - - for (i = 0; i < 3; i++) { - memset (&stroke, 0, sizeof (AccessibleKeystroke)); -- g_assert (SPI_generateKeyboardEvent ('=', NULL, SPI_KEY_SYM)); -+ g_assert (SPI_generateKeyboardEvent ('t', NULL, SPI_KEY_SYM)); - while (!(key_press_received)) - g_main_context_iteration (NULL, TRUE); - fprintf (stderr, "p [%s]", stroke.keystring); -- g_assert (!strcmp (stroke.keystring, "=")); -+ g_assert (!strcmp (stroke.keystring, "t")); - while (!(key_release_received)) - g_main_context_iteration (NULL, TRUE); - fprintf (stderr, "r [%s]", stroke.keystring); diff --git a/gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch b/gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch deleted file mode 100644 index c80aa5874e2d..000000000000 --- a/gnome-extra/at-spi/files/at-spi-1.30.1-make-382.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://bugs.gentoo.org/333645 - ---- Makefile.am -+++ Makefile.am -@@ -12,11 +12,11 @@ - - if GCONF_SCHEMAS_INSTALL - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -- for p in $(schemas_DATA) ; do \ -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \ -- done \ -- fi -+ if test -z "$(DESTDIR)" ; then \ -+ for p in $(schemas_DATA) ; do \ -+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \ -+ done \ -+ fi - else - install-data-local: - endif diff --git a/gnome-extra/bug-buddy/Manifest b/gnome-extra/bug-buddy/Manifest deleted file mode 100644 index 7b25820e910b..000000000000 --- a/gnome-extra/bug-buddy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bug-buddy-2.32.0.tar.bz2 701052 SHA256 ffdc70fe4a59c0aef42b5b0b72b08f17db2b1d9f49ba2b68722334ddbee5e3ca diff --git a/gnome-extra/bug-buddy/bug-buddy-2.32.0-r2.ebuild b/gnome-extra/bug-buddy/bug-buddy-2.32.0-r2.ebuild deleted file mode 100644 index 7df8d862274b..000000000000 --- a/gnome-extra/bug-buddy/bug-buddy-2.32.0-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/bug-buddy/bug-buddy-2.32.0-r2.ebuild,v 1.9 2013/03/29 14:44:07 pacho Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit gnome2 eutils - -DESCRIPTION="A graphical bug reporting tool" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="Ximian-logos GPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="eds" - -RDEPEND=">=gnome-base/libbonobo-2 - >=dev-libs/glib-2.16:2 - >=dev-libs/libxml2-2.4.6 - >=x11-libs/gtk+-2.14:2 - >=net-libs/libsoup-2.4:2.4 - >=gnome-base/libgtop-2.13.3:2 - >=gnome-base/gconf-2:2 - || ( dev-libs/elfutils dev-libs/libelf ) - >=sys-devel/gdb-5.1 - eds? ( -Date: Tue, 22 Jun 2010 20:18:23 +0000 -Subject: Do not call old log_handler if it is not glib's default - -See https://bugzilla.gnome.org/show_bug.cgi?id=622068 ---- -diff --git a/segv_handler/gnome-segvhanlder.c b/segv_handler/gnome-segvhanlder.c -index de64df5..ae3196e 100644 ---- a/segv_handler/gnome-segvhanlder.c -+++ b/segv_handler/gnome-segvhanlder.c -@@ -284,6 +284,13 @@ gtk_module_init (int *argc, char** argv[]) - sigaction(SIGBUS, setptr, NULL); - - old_handler = g_log_set_default_handler (bug_buddy_log_handler, NULL); -+ -+ /* We cannot call previous log handlers other than glib's default -+ * because we don't know its previous user_data and they may rely on it -+ * See https://bugzilla.gnome.org/show_bug.cgi?id=622068 */ -+ if (old_handler != g_log_default_handler) { -+ old_handler = NULL; -+ } - } - return 0; - } --- -cgit v0.8.3.1 diff --git a/gnome-extra/bug-buddy/metadata.xml b/gnome-extra/bug-buddy/metadata.xml deleted file mode 100644 index da6fd63d0085..000000000000 --- a/gnome-extra/bug-buddy/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -gnome - diff --git a/gnome-extra/cinnamon/cinnamon-2.2.16-r1.ebuild b/gnome-extra/cinnamon/cinnamon-2.2.16-r1.ebuild deleted file mode 100644 index 71b447b954d5..000000000000 --- a/gnome-extra/cinnamon/cinnamon-2.2.16-r1.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.16-r1.ebuild,v 1.1 2014/10/02 10:18:05 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools eutils gnome2 multilib pax-utils python-single-r1 - -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" -HOMEPAGE="http://cinnamon.linuxmint.com/" - -MY_PV="${PV/_p/-UP}" -MY_P="${PN}-${MY_PV}" - -SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -# bluetooth support dropped due bug #511648 -IUSE="+l10n +networkmanager" #+bluetooth -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -KEYWORDS="~amd64 ~x86" - -COMMON_DEPEND=" - app-misc/ca-certificates - dev-libs/dbus-glib - >=dev-libs/glib-2.29.10:2 - >=dev-libs/gobject-introspection-0.10.1 - >=dev-libs/json-glib-0.13.2 - >=dev-libs/libcroco-0.6.2:0.6 - dev-libs/libxml2:2 - gnome-base/gconf:2[introspection] - gnome-base/librsvg - >=gnome-extra/cinnamon-desktop-1.0:0=[introspection] - gnome-extra/cinnamon-menus[introspection] - >=gnome-extra/cjs-1.9.0 - >=media-libs/clutter-1.7.5:1.0[introspection] - media-libs/cogl:1.0=[introspection] - >=gnome-base/gsettings-desktop-schemas-2.91.91 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/libcanberra - media-sound/pulseaudio:0=[glib] - net-libs/libsoup:2.4[introspection] - >=sys-auth/polkit-0.100[introspection] - x11-libs/gdk-pixbuf:2[introspection] - >=x11-libs/gtk+-3.0.0:3[introspection] - x11-libs/pango[introspection] - >=x11-libs/startup-notification-0.11 - x11-libs/libX11 - >=x11-libs/libXfixes-5.0 - >=x11-wm/muffin-1.9.1[introspection] - ${PYTHON_DEPS} - networkmanager? ( - gnome-base/libgnome-keyring - >=net-misc/networkmanager-0.8.999[introspection] ) -" -#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) - -# Runtime-only deps are probably incomplete and approximate. -# Each block: -# 2. Introspection stuff + dconf needed via imports.gi.* -# 3. gnome-session is needed for gnome-session-quit -# 4. Control shell settings -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast -# user switching with gdm-3.1.x) -# 6. caribou needed for on-screen keyboard -# 7. xdg-utils needed for xdg-open, used by extension tool -# 8. gconf-python, imaging, lxml needed for cinnamon-settings -# 9. gnome-icon-theme-symbolic needed for various icons -# 10. pygobject needed for menu editor -# 11. nemo - default file manager, tightly integrated with cinnamon -# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory -# note: needs gksu, not gksu-polkit, due to extensive use of --message/-m arg -RDEPEND="${COMMON_DEPEND} - >=gnome-base/dconf-0.4.1 - >=gnome-base/libgnomekbd-2.91.4[introspection] - || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) - - gnome-extra/cinnamon-session - - gnome-extra/cinnamon-settings-daemon - - >=sys-apps/accountsservice-0.6.14[introspection] - - >=app-accessibility/caribou-0.3 - - x11-libs/gksu - x11-misc/xdg-utils - - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/gconf-python:2 - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/pypam[${PYTHON_USEDEP}] - virtual/python-imaging[${PYTHON_USEDEP}] - - x11-themes/gnome-themes-standard[gtk] - x11-themes/gnome-icon-theme-symbolic - - gnome-extra/nemo - gnome-extra/cinnamon-control-center - gnome-extra/cinnamon-screensaver - - l10n? ( >=gnome-extra/cinnamon-translations-2.2 ) - networkmanager? ( - gnome-extra/nm-applet - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) -" -#bluetooth? ( net-wireless/cinnamon-bluetooth ) - -DEPEND="${COMMON_DEPEND} - dev-python/polib[${PYTHON_USEDEP}] - >=sys-devel/gettext-0.17 - virtual/pkgconfig - >=dev-util/intltool-0.40 - gnome-base/gnome-common - !!=dev-lang/spidermonkey-1.8.2* -" -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time -# https://bugs.gentoo.org/show_bug.cgi?id=360413 - -S="${WORKDIR}/Cinnamon-${PV}" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - # Fix GNOME 3.8 support - epatch "${FILESDIR}/background.patch" - - # Fix automagic gnome-bluetooth dep, bug #398145 - epatch "${FILESDIR}/${PN}-2.2.6-automagic-gnome-bluetooth.patch" - - # Optional NetworkManager, bug #488684 - epatch "${FILESDIR}/${PN}-2.2.6-optional-networkmanager.patch" - - # Fix lspci path, https://github.com/linuxmint/Cinnamon/issues/3548 - epatch "${FILESDIR}/${PN}-2.2.16-sbin-lspci.patch" - - # Gentoo uses /usr/$(get_libdir), not /usr/lib even for python - sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \ - -e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \ - -i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \ - -i files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py \ - -i files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py \ - -i files/usr/lib/cinnamon-settings/cinnamon-settings.py \ - -i files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py \ - -i files/usr/lib/cinnamon-settings/data/spices/applet-detail.html \ - -i files/usr/lib/cinnamon-settings/bin/*.py \ - -i files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py \ - -i files/usr/lib/cinnamon-menu-editor/cme/*.py \ - -i files/usr/bin/* || die "sed failed" - if [[ "$(get_libdir)" != lib ]]; then - mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed" - fi - - if ! use networkmanager; then - rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die - fi - - python_fix_shebang . - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # Don't error out on warnings - gnome2_src_configure \ - --disable-jhbuild-wrapper-script \ - $(use_enable networkmanager) \ - --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \ - BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \ - --without-bluetooth - #$(use_with bluetooth) -} - -src_install() { - gnome2_src_install - python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{desktop-editor,json-makepot,launcher,looking-glass,menu-editor,screensaver-lock-dialog,settings,settings-users} - - # Required for gnome-shell on hardened/PaX, bug #398941 - pax-mark mr "${ED}usr/bin/cinnamon" - - # Doesn't exist on Gentoo, causing this to be a dead symlink - rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of Cinnamon's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "org.cinnamon.recorder/pipeline to what you want to use." - fi - - if ! has_version ">=x11-base/xorg-server-1.11"; then - ewarn "If you use multiple screens, it is highly recommended that you" - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" - ewarn "pointer barriers which will make it easier to use hot corners." - fi - - if has_version "=glib-2.32, only can be included directly. - ---- a/deskbar/handlers/evolution/evolution.c -+++ b/deskbar/handlers/evolution/evolution.c -@@ -1,5 +1,4 @@ - #include --#include - #include - #include - #include ---- a/deskbar/handlers/evolution/evolution.h -+++ b/deskbar/handlers/evolution/evolution.h -@@ -2,7 +2,7 @@ - #ifndef __DESKBAR_EVOLUTION_H__ - #define __DESKBAR_EVOLUTION_H__ - --#include -+#include - #include - - G_BEGIN_DECLS diff --git a/gnome-extra/deskbar-applet/metadata.xml b/gnome-extra/deskbar-applet/metadata.xml deleted file mode 100644 index a37a1d32dbd8..000000000000 --- a/gnome-extra/deskbar-applet/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - gnome - - The goal of DeskbarApplet is to provide an omnipresent versatile search - interface. By typing search terms into the deskbar entry in your panel - you are presented with the search results as you type. - - - diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index 3c5adce1e931..1af0f0640dd7 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,5 +1,2 @@ -DIST evolution-data-server-2.32.3-patches.tar.xz 24072 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa SHA512 20e12257e7153d074f20c158fc16a5a8feed8e9ed34035c6d752e31ca5b21436e08d767433aa16b885ad0aa8a95b18b41f79c80f2b30db42a5af402082882d55 WHIRLPOOL 660000ccaa0160325b92cf26ea031c96190645ce4bd2a6fc83b03411c6a2bb7f7aadc0ca0a493e1ff386fd4ac4471035af2da0decb436db7f8cf74b792ac4bd2 -DIST evolution-data-server-2.32.3.tar.bz2 4322281 SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c SHA512 863ccea7717a7fe743155513e74fc8ea35f558702bd4ff1075e15d1a36c1ecd9d5e285bd2a81245d680c05cf0521029583134b4e1d12668244042df3f5e62dfb WHIRLPOOL 3c56210f477901c3ea2d4712e631d219969cb113ff1c4cba3fcefccb67fed363a6207025b46922b9c1f6ba3427b962b5e0565c6b1441249c74b29afa314e3580 DIST evolution-data-server-3.12.4.tar.xz 5450044 SHA256 5e424ec560e46e0b26d290d04ad5146d9b313a956abcf99ef46ac3d8633060c7 SHA512 24e3ff14c54845c22e038034ea537e5a1f9a57cd7d7aab8a5b16db3a40bf394282c47467b2b5829ab577e275eaabcd566b4a9ba1a18dd185f4dbe0818ff94cc8 WHIRLPOOL f8989993970adbcd10fd3511d4ad0ceeff6897509c4f048c3c993be6ef6de858fe1a20889eaeebda096b31b159a5b0dfd68cea191bfad88330c2662cf295ee41 -DIST evolution-data-server-3.12.7.1.tar.xz 5390360 SHA256 7b2cc3169267801aef2b76a832a7df72af7bd1931fe1d98f474df9f306d4f79e SHA512 7fb39aa68d141eb51fed246e940c58baac612f58caad01a6880c285fe7393049276130462f8e3b992ac6ea0d1adf6339c90170db62f01028f265ecc5b447ef8f WHIRLPOOL 2975b69f0e3379f6341569180ecc7db310e888c1b874e38f12e9f7f1e6da569d4084177db18b9244337e5ce06135dddf35f078febd16a1b7c9a84ad87adb469c DIST evolution-data-server-3.12.8.tar.xz 5392696 SHA256 06fb4b9a1137b77a53e94eb69e4aeedd8f92d1bd1cfa0175f607660dd3b30818 SHA512 570b2c7b160a625517bc85de690f3fad03bef0fbb8bd2019e597f3a4071833478bae64c253a4fcb97c9025b8f1f97e927729caa484c207bb486d9891faccfcd6 WHIRLPOOL 15e9b3bae7b1e24c10e497a9b17571a26bc35e15b871d6a56ad5076a2795f2a86aa1b3d753f4dc1fe98b0c38155522a9bde983d3484c65e6a94b3d684840c259 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild deleted file mode 100644 index 128e8594dec0..000000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild,v 1.10 2013/02/24 11:25:55 ago Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME_TARBALL_SUFFIX="bz2" -WANT_AUTOMAKE="1.11" - -inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="http://projects.gnome.org/evolution/" - -SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" - -IUSE="ipv6 kerberos gnome-keyring ldap +weather" - -RDEPEND=">=dev-libs/glib-2.25.12:2 - >=x11-libs/gtk+-2.24:2 - >=gnome-base/gconf-2 - >=dev-db/sqlite-3.5:= - >=dev-libs/libgdata-0.6.3:= - >=dev-libs/libical-0.43:= - >=net-libs/libsoup-2.4:2.4 - >=dev-libs/libxml2-2:= - >=sys-libs/db-4:= - sys-libs/zlib:= - virtual/libiconv - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - gnome-keyring? ( gnome-base/libgnome-keyring ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-2:= ) - weather? ( - >=dev-libs/libgweather-2.25.4:2 - =gnome-base/gnome-common-2 - -src_prepare() { - DOCS="ChangeLog MAINTAINERS NEWS TODO" - - # ssl stuff always enabled as recommended in upstream bug #642984 - G2CONF="${G2CONF} - $(use_enable gnome-keyring) - $(use_enable ipv6) - $(use_with kerberos krb5 /usr) - $(use_with ldap openldap) - $(use_with weather) - --disable-gtk3 - --enable-largefile - --with-libdb=/usr - --enable-ssl - --enable-smime" - - # Adjust to gentoo's /etc/service - epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch" - - # GNOME bug 611353 (skips failing test atm) - epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch" - - # GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo) - sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \ - -i addressbook/tests/Makefile.{am,in} \ - || die "failing test sed 1 failed" - - # Apply multiple backports and fixed from master and 2.32 branches - # - # 009 and 010 patches are broken, bug #372651 - rm "${WORKDIR}/${P}-patches"/009*.patch || die - rm "${WORKDIR}/${P}-patches"/010*.patch || die - epatch "${WORKDIR}/${P}-patches"/*.patch - - # Upstream bug #655167 - Messages moved from IMAP Inbox reappear - epatch "${FILESDIR}/${P}-imap-move.patch" - - # Fix building with glib-2.32, bug #412109 - epatch "${FILESDIR}/${P}-gmodule-explicit.patch" - epatch "${FILESDIR}/${P}-g_thread_init.patch" - - # Upstream bug #669003 - CalDAV: Cannot modify calendar object (libical 0.48) - epatch "${FILESDIR}/${P}-libical-0.48.patch" - - # Fix building with libxml2-2.9, backported from eds-3.6 - epatch "${FILESDIR}/${P}-libxml2-2.9.patch" - - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - append-cppflags "-I$(db_includedir)" - - # FIXME: Fix compilation flags crazyness - sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \ - -i configure.ac configure || die "sed 3 failed" - - sed -e "/AM_INIT_AUTOMAKE/s/-Werror//" -i configure.ac || die - - eautoreconf - gnome2_src_prepare -} - -src_install() { - # Prevent this evolution-data-server from linking to libs in the installed - # evolution-data-server libraries by adding -L arguments for build dirs to - # every .la file's relink_command field, forcing libtool to look there - # first during relinking. This will mangle the .la files installed by - # make install, but we don't care because we will be punting them anyway. - perl "${FILESDIR}/fix_relink_command.pl" . \ - || die "fix_relink_command.pl failed" - - gnome2_src_install - - if use ldap; then - MY_MAJORV=$(get_version_component_range 1-2) - insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema || die "doins failed" - dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema - fi -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - unset ORBIT_SOCKETDIR - unset SESSION_MANAGER - export XDG_DATA_HOME="${T}" - unset DISPLAY - Xemake check || die "Tests failed." -} - -pkg_preinst() { - gnome2_pkg_preinst - - for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \ - libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \ - libedata-book-1.2.so.2 libebook-1.2.so.9 \ - libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8 - do - preserve_old_lib /usr/$(get_libdir)/$lib - done -} - -pkg_postinst() { - gnome2_pkg_postinst - - for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \ - libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \ - libedata-book-1.2.so.2 libebook-1.2.so.9 \ - libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8 - do - preserve_old_lib_notify /usr/$(get_libdir)/$lib - done - - if use ldap; then - elog "" - elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema" - fi -} diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.7.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.7.1.ebuild deleted file mode 100644 index de6770038bc8..000000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.12.7.1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.12.7.1.ebuild,v 1.1 2014/10/15 15:41:55 leio Exp $ - -EAPI="5" -GCONF_DEBUG="no" -# python3 not really supported, bug #478678 -PYTHON_COMPAT=( python2_7 pypy pypy2_0 ) -VALA_MIN_API_VERSION="0.18" -VALA_USE_DEPEND="vapigen" - -inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" -SLOT="0/49" # subslot = libcamel-1.2 soname version -IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" - -RDEPEND=" - >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5[crypt] - >=dev-db/sqlite-3.5:= - >=dev-libs/glib-2.36:2 - >=dev-libs/libgdata-0.10:= - >=dev-libs/libical-0.43:= - >=net-libs/libsoup-2.42:2.4 - >=dev-libs/libxml2-2 - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - >=sys-libs/db-4:= - - dev-libs/icu:= - sys-libs/zlib:= - virtual/libiconv - - gtk? ( - >=app-crypt/gcr-3.4[gtk] - >=x11-libs/gtk+-3.2:3 - ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) - kerberos? ( virtual/krb5:= ) - ldap? ( >=net-nds/openldap-2:= ) - weather? ( >=dev-libs/libgweather-3.8:2= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/gdbus-codegen - dev-util/gperf - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.35.5 - >=gnome-base/gnome-common-3.5.5 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) )" -# eautoreconf needs: -# >=gnome-base/gnome-common-2 - -# Some tests fail due to missings locales. -# Also, dbus tests are flacky, bugs #397975 #501834 -# It looks like a nightmare to disable those for now. -RESTRICT="test" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - use vala && vala_src_prepare - - # Fix relink issues in src_install - ELTCONF="--reverse-deps" - - gnome2_src_prepare - - # Fix compilation flags crazyness, upstream bug #653157 - sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \ - -i configure || die "sed failed" -} - -src_configure() { - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - append-cppflags "-I$(db_includedir)" - - # phonenumber does not exist in tree - gnome2_src_configure \ - $(use_enable api-doc-extras gtk-doc) \ - $(use_with api-doc-extras private-docs) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable gtk) \ - $(use_enable introspection) \ - $(use_enable ipv6) \ - $(use_with kerberos krb5 "${EPREFIX}"/usr) \ - $(use_with ldap openldap) \ - $(use_enable vala vala-bindings) \ - $(use_enable weather) \ - --enable-google \ - --enable-largefile \ - --enable-smime \ - --with-libdb="${EPREFIX}"/usr \ - --without-phonenumber \ - --disable-examples \ - --disable-uoa -} - -src_install() { - gnome2_src_install - - if use ldap; then - insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema - dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema - fi -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - unset ORBIT_SOCKETDIR - unset SESSION_MANAGER - unset DISPLAY - Xemake check -} diff --git a/gnome-extra/evolution-data-server/files/e-d-s-camel-skip-failing-test.patch b/gnome-extra/evolution-data-server/files/e-d-s-camel-skip-failing-test.patch deleted file mode 100644 index 3c07f0959139..000000000000 --- a/gnome-extra/evolution-data-server/files/e-d-s-camel-skip-failing-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -We are currently skipping this test so we can pass make check -Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=611353 -diff --git a/calendar/tests/ecal/test-ecal-get-free-busy.c b/calendar/tests/ecal/test-ecal-get-free-busy.c -index 8ecdf7e..471d807 100644 ---- a/calendar/tests/ecal/test-ecal-get-free-busy.c -+++ b/calendar/tests/ecal/test-ecal-get-free-busy.c -@@ -10,6 +10,7 @@ - gint - main (gint argc, gchar **argv) - { -+#if 0 - ECal *cal; - gchar *uri = NULL; - GList *users = NULL; -@@ -34,6 +35,6 @@ main (gint argc, gchar **argv) - - g_list_foreach (free_busy, (GFunc) g_object_unref, NULL); - g_list_free (free_busy); -- -+#endif - return 0; - } diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-gentoo_etc_services.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-gentoo_etc_services.patch deleted file mode 100644 index b7c7dceebc98..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-gentoo_etc_services.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 02cc551defa9cb222216b4ae03a9e883a9abcb64 Mon Sep 17 00:00:00 2001 -From: Romain Perier -Date: Mon, 28 Sep 2009 21:34:36 +0200 -Subject: [PATCH] Adjust imap+pop3 stuffs to gentoo services - ---- - camel/providers/imap/camel-imap-store.c | 2 +- - camel/providers/pop3/camel-pop3-store.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c -index a5eb640..1574e79 100644 ---- a/camel/providers/imap/camel-imap-store.c -+++ b/camel/providers/imap/camel-imap-store.c -@@ -846,7 +846,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex) - fallback_port = ssl_options[i].fallback_port; - } else { - mode = MODE_CLEAR; -- serv = (gchar *) "imap"; -+ serv = (gchar *) "imap2"; - fallback_port = IMAP_PORT; - } - -diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c -index 89be794..a79c06b 100644 ---- a/camel/providers/pop3/camel-pop3-store.c -+++ b/camel/providers/pop3/camel-pop3-store.c -@@ -268,7 +268,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex) - fallback_port = ssl_options[i].fallback_port; - } else { - mode = MODE_CLEAR; -- serv = (gchar *) "pop3"; -+ serv = (gchar *) "pop-3"; - fallback_port = POP3S_PORT; - } - - --- -1.6.5.rc1 - diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-g_thread_init.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-g_thread_init.patch deleted file mode 100644 index d85910a79245..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-g_thread_init.patch +++ /dev/null @@ -1,149 +0,0 @@ -From ffdfc6c7005e967a96f9ad0ea32ce782f0126a56 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Mon, 24 Oct 2011 09:42:17 +0200 -Subject: [PATCH] Call g_thread_init() conditionally - -[Alexandre Rostovtsev : backport to 2.32] ---- - addressbook/libedata-book/e-data-book-factory.c | 2 ++ - calendar/backends/file/e-cal-backend-file.c | 2 ++ - calendar/libedata-cal/e-data-cal-factory.c | 2 ++ - camel/camel-index-control.c | 4 +++- - camel/camel-text-index.c | 2 ++ - camel/providers/imapx/test-imapx.c | 2 ++ - camel/tests/lib/camel-test.c | 2 ++ - libedataserverui/test-name-selector.c | 2 ++ - servers/groupwise/soap-test.c | 2 ++ - 9 files changed, 19 insertions(+), 1 deletions(-) - -diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c -index 310ee2b..7c25f9c 100644 ---- a/addressbook/libedata-book/e-data-book-factory.c -+++ b/addressbook/libedata-book/e-data-book-factory.c -@@ -602,7 +602,9 @@ main (gint argc, gchar **argv) - - g_type_init (); - g_set_prgname (E_PRGNAME); -+ #if !GLIB_CHECK_VERSION(2,31,0) - if (!g_thread_supported ()) g_thread_init (NULL); -+ #endif - - factory = g_object_new (E_TYPE_DATA_BOOK_FACTORY, NULL); - -diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c -index 9bacb88..3721240 100644 ---- a/calendar/backends/file/e-cal-backend-file.c -+++ b/calendar/backends/file/e-cal-backend-file.c -@@ -3786,7 +3786,9 @@ main(gint argc, gchar **argv) - FILE* fin = NULL; - - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - context = g_option_context_new ("- test utility for e-d-s file backend"); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); -diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c -index db9cc1c..aa35082 100644 ---- a/calendar/libedata-cal/e-data-cal-factory.c -+++ b/calendar/libedata-cal/e-data-cal-factory.c -@@ -911,7 +911,9 @@ main (gint argc, gchar **argv) - - g_type_init (); - g_set_prgname (E_PRGNAME); -+ #if !GLIB_CHECK_VERSION(2,31,0) - if (!g_thread_supported ()) g_thread_init (NULL); -+ #endif - - #ifdef HAVE_ICAL_UNKNOWN_TOKEN_HANDLING - ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN); -diff --git a/camel/camel-index-control.c b/camel/camel-index-control.c -index 771cba2..9c15971 100644 ---- a/camel/camel-index-control.c -+++ b/camel/camel-index-control.c -@@ -124,7 +124,9 @@ gint main(gint argc, gchar **argv) - if (argc<2) - do_usage(argv[0]); - -- g_thread_init(NULL); -+ #if !GLIB_CHECK_VERSION(2,31,0) -+ g_thread_init (NULL); -+ #endif - camel_init(NULL, 0); - - if (!strcmp(argv[1], "compress")) -diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c -index e242669..8240608 100644 ---- a/camel/camel-text-index.c -+++ b/camel/camel-text-index.c -@@ -1851,7 +1851,9 @@ gint main (gint argc, gchar **argv) - - printf ("Camel text index tester!\n"); - -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - camel_init (NULL, 0); - - idx = (CamelIndex *)camel_text_index_new ("textindex", O_CREAT|O_RDWR|O_TRUNC); -diff --git a/camel/providers/imapx/test-imapx.c b/camel/providers/imapx/test-imapx.c -index ede8d65..6db0ab7 100644 ---- a/camel/providers/imapx/test-imapx.c -+++ b/camel/providers/imapx/test-imapx.c -@@ -36,7 +36,9 @@ main (gint argc, gchar *argv[]) - } - - uri = argv[1]; -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - system ("rm -rf /tmp/test-camel-imapx"); - camel_init ("/tmp/test-camel-imapx", TRUE); - camel_provider_init (); -diff --git a/camel/tests/lib/camel-test.c b/camel/tests/lib/camel-test.c -index 44a20ae..42703e8 100644 ---- a/camel/tests/lib/camel-test.c -+++ b/camel/tests/lib/camel-test.c -@@ -99,8 +99,10 @@ camel_test_init(gint argc, gchar **argv) - setup = 1; - - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - /* yeah, we do need ot thread init, even though camel isn't compiled with enable threads */ - g_thread_init (NULL); -+ #endif - - path = g_strdup_printf ("/tmp/camel-test"); - if (mkdir (path, 0700) == -1 && errno != EEXIST) -diff --git a/libedataserverui/test-name-selector.c b/libedataserverui/test-name-selector.c -index 71552b1..8f92e2d 100644 ---- a/libedataserverui/test-name-selector.c -+++ b/libedataserverui/test-name-selector.c -@@ -83,7 +83,9 @@ gint - main (gint argc, gchar **argv) - { - gtk_init (&argc, &argv); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - camel_init (NULL, 0); - -diff --git a/servers/groupwise/soap-test.c b/servers/groupwise/soap-test.c -index 221a8b7..0ab93f0 100644 ---- a/servers/groupwise/soap-test.c -+++ b/servers/groupwise/soap-test.c -@@ -49,7 +49,9 @@ gint - main (gint argc, gchar *argv[]) - { - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - /* Hostname Eg: http(s)://domain_name:/port_number/soap */ - if (argc != 3 && argc != 4) { --- -1.7.8.5 - diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-gmodule-explicit.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-gmodule-explicit.patch deleted file mode 100644 index 3e1f4ed3f936..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-gmodule-explicit.patch +++ /dev/null @@ -1,52 +0,0 @@ -From be8a4f87a7187e0da249cd66444125d25e76afb1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Diego=20L=C3=B3pez=20Le=C3=B3n?= -Date: Tue, 29 Nov 2011 19:34:12 -0600 -Subject: [PATCH] Bug 664819 - gmodule-2.0 dependency must be explicit - -[Alexandre Rostovtsev : backport to 2.32.3] ---- - configure.ac | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0879fcf..9ff3dab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -319,6 +319,7 @@ dnl Check for base dependencies early. - dnl *********************************** - PKG_CHECK_MODULES(GNOME_PLATFORM, - [gio-2.0 >= glib_minimum_version -+ gmodule-2.0 >= glib_minimum_version - $GTK_MODULE - gconf-2.0 >= gconf_minimum_version - libxml-2.0 >= libxml_minimum_version -@@ -1198,7 +1199,7 @@ AC_DEFUN([EVO_SET_COMPILE_FLAGS], [ - dnl ****************************** - dnl libedataserver flags - dnl ****************************** --E_DATA_SERVER_DEPS="gio-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr" -+E_DATA_SERVER_DEPS="gio-2.0 gmodule-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr" - - EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $MANUAL_NSPR_CFLAGS, $MANUAL_NSPR_LIBS) - AC_SUBST(E_DATA_SERVER_CFLAGS) -@@ -1213,7 +1214,7 @@ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, , ) - AC_SUBST(E_DATA_SERVER_UI_CFLAGS) - AC_SUBST(E_DATA_SERVER_UI_LIBS) - --E_BACKEND_DEPS="gio-2.0 libxml-2.0 gconf-2.0" -+E_BACKEND_DEPS="gio-2.0 gmodule-2.0 libxml-2.0 gconf-2.0" - - dnl ****************************** - dnl libebackend flags -@@ -1356,7 +1357,7 @@ fi - - AM_CONDITIONAL(ENABLE_LARGEFILE, [test "x$enable_largefile" = "xyes"]) - --EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS) -+EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 gmodule-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS) - AC_SUBST(CAMEL_CFLAGS) - AC_SUBST(CAMEL_LIBS) - AC_SUBST(CAMEL_GROUPWISE_CFLAGS) --- -1.7.8.5 - diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch deleted file mode 100644 index 1fd7830dd720..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3ac86d14dc1ea89424de3c83e4d4b21eb1d1020e Mon Sep 17 00:00:00 2001 -From: Michel Dänzer -Date: Wed, 02 Nov 2011 07:35:56 +0000 -Subject: Bug #655167 - Messages moved from IMAP Inbox reappear - ---- -diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c -index 77faa64..751e6cd 100644 ---- a/camel/providers/imap/camel-imap-folder.c -+++ b/camel/providers/imap/camel-imap-folder.c -@@ -68,11 +68,6 @@ enum { - PROP_CHECK_FOLDER = 0x2500 - }; - --enum { -- /* used when moving messages and has real trash folder set with a google account */ -- CAMEL_MESSAGE_IMAP_MOVED = CAMEL_MESSAGE_FOLDER_FLAGGED << 1 --}; -- - extern gint camel_application_is_exiting; - - static gboolean imap_rescan (CamelFolder *folder, gint exists, GCancellable *cancellable, GError **error); -@@ -1417,7 +1412,7 @@ get_matching (CamelFolder *folder, - } - } - -- if (deleted_uids && (info->info.flags & (CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_IMAP_MOVED)) == CAMEL_MESSAGE_DELETED) { -+ if (deleted_uids && (info->info.flags & (CAMEL_MESSAGE_DELETED | CAMEL_IMAP_MESSAGE_MOVED)) == CAMEL_MESSAGE_DELETED) { - g_ptr_array_add (deleted_uids, (gpointer) camel_pstring_strdup (camel_message_info_uid (info))); - info->info.flags &= ~CAMEL_MESSAGE_DELETED; - } else if (junked_uids && (info->info.flags & CAMEL_MESSAGE_JUNK) != 0) { -@@ -1747,7 +1742,7 @@ imap_synchronize_sync (CamelFolder *folder, - info->info.flags &= ~CAMEL_MESSAGE_DELETED; - } - -- info->info.flags &= ~(CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_MESSAGE_IMAP_MOVED); -+ info->info.flags &= ~(CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_IMAP_MESSAGE_MOVED); - ((CamelImapMessageInfo *) info)->server_flags = info->info.flags & CAMEL_IMAP_SERVER_FLAGS; - info->info.dirty = TRUE; /* Sync it back to the DB */ - if (((CamelMessageInfo *) info)->summary) -@@ -2841,7 +2836,7 @@ do_copy (CamelFolder *source, - CamelMessageInfoBase *info = (CamelMessageInfoBase *) camel_folder_summary_get (source->summary, uids->pdata[i]); - - if (info) -- info->flags |= CAMEL_MESSAGE_IMAP_MOVED; -+ info->flags |= CAMEL_IMAP_MESSAGE_MOVED; - } - } - last = uid; ---- a/camel/providers/imap/camel-imap-summary.h~ 2011-04-21 21:35:36.000000000 +0200 -+++ b/camel/providers/imap/camel-imap-summary.h 2012-02-12 18:15:16.419609530 +0100 -@@ -53,7 +53,9 @@ - G_BEGIN_DECLS - - enum { -- CAMEL_IMAP_MESSAGE_RECENT = 1<<17 -+ CAMEL_IMAP_MESSAGE_RECENT = 1 << 17, -+ /* used when moving messages and has real trash folder set with a google account */ -+ CAMEL_IMAP_MESSAGE_MOVED = 1 << 18 - }; - - typedef struct _CamelImapSummary CamelImapSummary; diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libical-0.48.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libical-0.48.patch deleted file mode 100644 index dd4e20b06a78..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libical-0.48.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 830fa86226aa2c4fd0687aef605c93920888e3c4 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Mon, 30 Jan 2012 18:25:41 +0000 -Subject: Bug #669003 - CalDAV: Cannot modify calendar object (libical 0.48) - ---- -diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c -index 694e64a..50cece5 100644 ---- a/calendar/backends/caldav/e-cal-backend-caldav.c -+++ b/calendar/backends/caldav/e-cal-backend-caldav.c -@@ -422,6 +422,24 @@ ecalcomp_get_etag (ECalComponent *comp) - - str = icomp_x_prop_get (icomp, X_E_CALDAV "ETAG"); - -+ /* libical 0.48 escapes quotes, thus unescape them */ -+ if (str && strchr (str, '\\')) { -+ gint ii, jj; -+ -+ for (ii = 0, jj = 0; str[ii]; ii++) { -+ if (str[ii] == '\\') { -+ ii++; -+ if (!str[ii]) -+ break; -+ } -+ -+ str[jj] = str[ii]; -+ jj++; -+ } -+ -+ str[jj] = 0; -+ } -+ - return str; - } - --- -cgit v0.9.0.2 diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch deleted file mode 100644 index 765e4aea8ca1..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 9792cbd0f131a972e132a60fa59c89244dea793d Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Mon, 13 Aug 2012 09:50:50 -0400 -Subject: [PATCH] Bug 681321 - Support both old and new-buf libxml2 APIs - -libxml2 changed the API for xmlOutputBuffer incompatibly. -See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html ---- - calendar/backends/caldav/e-cal-backend-caldav.c | 35 +++++++++++++++++++------ - 1 file changed, 27 insertions(+), 8 deletions(-) - -diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c -index 80c5a39..4343857 100644 ---- a/calendar/backends/caldav/e-cal-backend-caldav.c -+++ b/calendar/backends/caldav/e-cal-backend-caldav.c -@@ -499,6 +499,19 @@ quote_etag (const gchar *etag) - return ret; - } - -+static gconstpointer -+compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, -+ gsize *out_len) -+{ -+#ifdef LIBXML2_NEW_BUFFER -+ *out_len = xmlOutputBufferGetSize (buf); -+ return xmlOutputBufferGetContent (buf); -+#else -+ *out_len = buf->buffer->use; -+ return buf->buffer->content; -+#endif -+} -+ - /* ************************************************************************* */ - - static gboolean -@@ -1035,6 +1048,8 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) - xmlDocPtr doc; - xmlNodePtr root, node; - xmlNsPtr ns, nsdav; -+ gconstpointer buf_content; -+ gsize buf_size; - gboolean result = TRUE; - - g_return_val_if_fail (cbdav != NULL, TRUE); -@@ -1069,11 +1084,11 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) - soup_message_headers_append (message->request_headers, - "Depth", "0"); - -+ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -- (gchar *) buf->buffer->content, -- buf->buffer->use); -+ buf_content, buf_size); - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); -@@ -1131,6 +1146,8 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint - xmlDocPtr doc; - xmlNsPtr nsdav; - xmlNsPtr nscd; -+ gconstpointer buf_content; -+ gsize buf_size; - gboolean result; - - priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav); -@@ -1211,11 +1228,11 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint - soup_message_headers_append (message->request_headers, - "Depth", "1"); - -+ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -- (gchar *) buf->buffer->content, -- buf->buffer->use); -+ buf_content, buf_size); - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); -@@ -1499,6 +1516,8 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) - xmlDocPtr doc; - xmlNodePtr root, node; - xmlNsPtr nsdav; -+ gconstpointer buf_content; -+ gsize buf_size; - gchar *owner = NULL; - - g_return_val_if_fail (cbdav != NULL, FALSE); -@@ -1527,11 +1546,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) - soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); - soup_message_headers_append (message->request_headers, "Depth", "0"); - -+ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -- (gchar *) buf->buffer->content, -- buf->buffer->use); -+ buf_content, buf_size); - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); -@@ -1577,11 +1596,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) - soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); - soup_message_headers_append (message->request_headers, "Depth", "0"); - -+ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -- (gchar *) buf->buffer->content, -- buf->buffer->use); -+ buf_content, buf_size); - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); --- -1.8.1.2 - diff --git a/gnome-extra/evolution-data-server/files/fix_relink_command.pl b/gnome-extra/evolution-data-server/files/fix_relink_command.pl deleted file mode 100644 index 12106c3856d6..000000000000 --- a/gnome-extra/evolution-data-server/files/fix_relink_command.pl +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/perl -# Fix the relink_command field of .la files in the specified directory tree -# to add "-L$dir/.libs" for every .la file that is specified in a relative -# $dir; place these new -L directives before the first relative .la file. -# -# E.g. : -# relink_command="(cd /tmp/foo/libfoo; /bin/sh /tmp/foo/libtool --silent --tag CC --mode=relink gcc -O2 foo.lo bar/libbar.la ../baz/libbaz.la /usr/lib/libfrob.la -lm)" -# will become -# relink_command="(cd /tmp/foo/libfoo; /bin/sh /tmp/foo/libtool --silent --tag CC --mode=relink gcc -O2 foo.lo -Lbar/.libs -L../baz/.libs bar/libbar.la ../baz/libbaz.la /usr/lib/libfrob.la -lm)" -# -# Such a procedure should ensure that during relinking, libraries in the -# local build tree will be looked at before libraries installed systemwide. -# -# Limitations: it is assumed that relink_command is one line. It is assumed -# that any spaces in paths are escaped using '\'. -# -# Copyright (c) 2011 Alexandre Rostovtsev -# -# This program is free software; you can redistribute it and/or modify it -# under the same terms as Perl itself. -use strict; -use warnings; - -use Cwd qw(realpath); -use File::Basename; -use File::Find; - -my %processed = (); -sub process_la_file { - my $filename = $_; # relative to cwd - my $pretty_filename = $File::Find::name; # relative to initial cwd - if (-d $filename) { return; } - - # don't process a single .la file multiple times (e.g. if symlinked) - my $realpath = realpath($filename); - if ($processed{$realpath}) { - print "$pretty_filename ($realpath) was already processed\n"; - return; - } else { - $processed{$realpath}++; - } - - # preserve the .la file's mtime in order to avoid triggering make rules - my $mtime = (stat $filename)[9]; - open(my $fh, '<', $filename) or die $!; - my $text; - my $changes; # whether the file has been changed - while (<$fh>) { - if (/relink_command=/) { - my ($start, $added, $end); - my $ignore = 0; # number of words to not check for similariy to - # an .la filename, following and including the - # current word - # split by unescaped spaces - for my $word (split /(? 0; - } - $_ = "$start$added$end"; - print "Added '$added' to relink_command in $pretty_filename\n" if $changes; - } - $text .= $_; - } - close $fh; - if ($changes) { - open($fh, '>', $filename) or die $!; - print $fh $text; - close $fh; - # Perl's utime does not support sub-second time :/ - # And Time::HiRes doesn't help. As a workaround, round up the number of - # seconds in order to avoid triggering make rules. - utime $mtime + 1, $mtime + 1, $filename; - } -} - -if (not @ARGV or $ARGV[0] eq '-h' or $ARGV[0] eq '--help') { - warn <