diff options
-rw-r--r-- | gnome-base/gdm/gdm-2.20.10-r1.ebuild | 5 | ||||
-rw-r--r-- | gnome-base/gnome-applets/Manifest | 2 | ||||
-rw-r--r-- | gnome-base/gnome-applets/gnome-applets-2.26.2.ebuild | 145 | ||||
-rw-r--r-- | gnome-base/gnome-settings-daemon/ChangeLog | 13 | ||||
-rw-r--r-- | gnome-base/gnome-settings-daemon/Manifest | 16 | ||||
-rw-r--r-- | gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch | 62 | ||||
-rw-r--r-- | gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild | 6 | ||||
-rw-r--r-- | gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild | 89 | ||||
-rw-r--r-- | gnome-base/libghttp/ChangeLog | 104 | ||||
-rw-r--r-- | gnome-base/libghttp/Manifest | 15 | ||||
-rw-r--r-- | gnome-base/libghttp/files/libghttp-1.0.9-fixlocale.patch | 42 | ||||
-rw-r--r-- | gnome-base/libghttp/libghttp-1.0.9-r4.ebuild | 46 | ||||
-rw-r--r-- | gnome-base/libghttp/metadata.xml | 5 |
13 files changed, 320 insertions, 230 deletions
diff --git a/gnome-base/gdm/gdm-2.20.10-r1.ebuild b/gnome-base/gdm/gdm-2.20.10-r1.ebuild index 6af3f35fd450..66b887cc632c 100644 --- a/gnome-base/gdm/gdm-2.20.10-r1.ebuild +++ b/gnome-base/gdm/gdm-2.20.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.10-r1.ebuild,v 1.1 2009/05/01 10:28:07 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.10-r1.ebuild,v 1.2 2009/06/17 22:56:52 eva Exp $ EAPI="2" @@ -175,6 +175,9 @@ src_install() { # Fix old X11R6 paths dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf + # Use Clearlooks as default theme, bug #268496 + dosed "s:#GtkTheme=Default:GtkTheme=Clearlooks:" /usr/share/gdm/defaults.conf + # Move Gentoo theme in if use branding ; then mv "${WORKDIR}"/gentoo-* "${D}/usr/share/gdm/themes" diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest index 11f9a7c385a2..f04e606db867 100644 --- a/gnome-base/gnome-applets/Manifest +++ b/gnome-base/gnome-applets/Manifest @@ -1,7 +1,9 @@ AUX gnome-applets-2.26.1-automagic-networkmanager.patch 1601 RMD160 748c0b5b2f3fb088669717a3c9d3e53951891d0d SHA1 70bf11d1a628270ea32b939dd1a08117e982f052 SHA256 5102332db7758817f970ffb6ba3751ad03a8c47f1950d59d706d5f6d3ba31ac1 DIST gnome-applets-2.24.3.1.tar.bz2 7880607 RMD160 aa36ca16e88821a860d825bff9ab94e144e283f7 SHA1 cc9a121bb06f687c221902c24dbdbe37bd68b07f SHA256 b9a3d207b78755c49c49bf780815f3b25fd16b6c23f3815cdeb41b5c7d685185 DIST gnome-applets-2.26.1.tar.bz2 8786596 RMD160 f76aa8a6b03e1375bad3bce5e2ee1b477a2e9097 SHA1 42b678064e4d0923c2130ac02f488871b9db7c88 SHA256 87a2262dd777a31dafda23d91da42f7b17e542dea51b5597ecada4fa74793a07 +DIST gnome-applets-2.26.2.tar.bz2 9056741 RMD160 3605219a5b3f2c9f23c34b72a226f9950d7d1341 SHA1 5126d80c8661ab6b85850e919d2d295693e0ee7e SHA256 9f6a1b7454d28cbd1dd0f57ae0eaccce2b49a7a8f528b498f9a5864300d9ec32 EBUILD gnome-applets-2.24.3.1.ebuild 3260 RMD160 7e170270d1eafe9179ac29211ec75df83e05f403 SHA1 56f858b21a9026ed6dc92aab82e9d7b5d836964b SHA256 5c508fd83bcd4ae10d3845f9a85ba8b5c55d05f7fb79ef68e9ecbc7cc85c0a5b EBUILD gnome-applets-2.26.1.ebuild 3901 RMD160 bf62d2699cd07b32900d828ee19ff89f47ef9411 SHA1 b777407c14f2419dd5c31064c56d7c239141cf13 SHA256 c1ae80dc37d24ddd36c8e3eca8881cd63d9a6e9202df28e371cd5ec49481414f +EBUILD gnome-applets-2.26.2.ebuild 3909 RMD160 c7a58f19ad439211081b1b524cc6d3b5b5ec5860 SHA1 9b55de3cb90ccf555aeeb209f2514a81e2c34742 SHA256 f6aff30281e450fcd06469a8d6b68add882f2dd55a8e95ca14e06d05997b7b85 MISC ChangeLog 41866 RMD160 2dca4aef830c7d52dd935cba09fb739f2b9a33df SHA1 267161c91640eb513307b7092b8c77eb429e9d79 SHA256 8e212cde14522fa566385d202f5bcda6c383e18c57cb954a8fb36ab5c112f6eb MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 diff --git a/gnome-base/gnome-applets/gnome-applets-2.26.2.ebuild b/gnome-base/gnome-applets/gnome-applets-2.26.2.ebuild new file mode 100644 index 000000000000..eb7deadb0a0c --- /dev/null +++ b/gnome-base/gnome-applets/gnome-applets-2.26.2.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2009 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.26.2.ebuild,v 1.1 2009/06/17 22:56:52 eva Exp $ + +inherit autotools eutils gnome2 python + +DESCRIPTION="Applets for the GNOME Desktop and Panel" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2 FDL-1.1 LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="acpi apm doc gnome gstreamer hal ipv6 networkmanager policykit" + +# TODO: configure says python stuff is optional +# my secret script says cpufrequtils might be needed in RDEPEND + +RDEPEND=">=x11-libs/gtk+-2.13 + >=dev-libs/glib-2.18.0 + >=gnome-base/gconf-2.8 + >=gnome-base/gnome-panel-2.13.4 + >=x11-libs/libxklavier-2.91 + >=x11-libs/libwnck-2.9.3 + >=gnome-base/gnome-desktop-2.11.1 + >=x11-libs/libnotify-0.3.2 + hal? ( >=sys-apps/hal-0.5.3 ) + >=sys-apps/dbus-1.1.2 + >=dev-libs/dbus-glib-0.74 + >=dev-libs/libxml2-2.5.0 + >=x11-themes/gnome-icon-theme-2.15.91 + >=dev-libs/libgweather-2.22.1 + >=virtual/python-2.4 + apm? ( sys-apps/apmd ) + x11-libs/libX11 + gnome? ( + >=gnome-base/libgnomekbd-2.21.4.1 + gnome-base/gnome-settings-daemon + + >=gnome-extra/gucharmap-2.23 + >=gnome-base/libgtop-2.11.92 + + >=dev-python/pygobject-2.6 + >=dev-python/pygtk-2.6 + >=dev-python/libgnome-python-2.10 + >=dev-python/gconf-python-2.10 + >=dev-python/gnome-applets-python-2.10 ) + gstreamer? ( + >=media-libs/gstreamer-0.10.2 + >=media-libs/gst-plugins-base-0.10.14 + || ( + >=media-plugins/gst-plugins-alsa-0.10.14 + >=media-plugins/gst-plugins-oss-0.10.14 ) ) + networkmanager? ( >=net-misc/networkmanager-0.7.0 ) + policykit? ( + >=sys-auth/policykit-0.7 + >=gnome-extra/policykit-gnome-0.7 )" + +DEPEND="${RDEPEND} + >=app-text/scrollkeeper-0.1.4 + >=app-text/gnome-doc-utils-0.3.2 + >=dev-util/pkgconfig-0.19 + >=dev-util/intltool-0.35 + dev-libs/libxslt + ~app-text/docbook-xml-dtd-4.3 + doc? ( app-text/docbook-sgml-utils )" + +DOCS="AUTHORS ChangeLog NEWS README" + +src_unpack() { + gnome2_src_unpack + + # disable pyc compiling + mv py-compile py-compile.orig + ln -s $(type -P true) py-compile + + # Networmanager is automagic, bug #266056 + epatch "${FILESDIR}/${PN}-2.26.1-automagic-networkmanager.patch" + + # Make it libtool-1 compatible, bug #266248 + rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" + + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf +} + +pkg_setup() { + G2CONF="${G2CONF} + --disable-scrollkeeper + --disable-schemas-install + --enable-flags + $(use_enable gstreamer mixer-applet) + $(use_with hal) + $(use_enable ipv6) + $(use_enable networkmanager) + $(use_enable policykit polkit)" + + if ! use ppc && ! use apm && ! use acpi; then + G2CONF="${G2CONF} --disable-battstat" + fi + + if use ppc && ! use apm; then + G2CONF="${G2CONF} --disable-battstat" + fi +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + emake check || die "emake check failed" +} + +src_install() { + gnome2_src_install + + local APPLETS="accessx-status battstat charpick cpufreq drivemount geyes + gkb-new gswitchit gweather invest-applet mini-commander + mixer modemlights multiload null_applet stickynotes trashapplet" + + # 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 + + if use acpi && ! use hal ; then + elog "It is highly recommended that you install acpid if you use the" + elog "battstat applet to prevent any issues with other applications " + elog "trying to read acpi information." + fi + + # check for new python modules on bumps + python_mod_optimize $(python_get_sitedir)/invest +} + +pkg_postrm() { + gnome2_pkg_postrm + python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/invest +} diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog index b435b74a12fd..d20a76c58c2c 100644 --- a/gnome-base/gnome-settings-daemon/ChangeLog +++ b/gnome-base/gnome-settings-daemon/ChangeLog @@ -1,13 +1,22 @@ # ChangeLog for gnome-base/gnome-settings-daemon # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.30 2009/05/10 23:01:36 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.31 2009/06/17 22:56:53 eva Exp $ + +*gnome-settings-daemon-2.24.1-r2 (14 May 2009) + + 14 May 2009; Gilles Dartiguelongue <eva@gentoo.org> + gnome-settings-daemon-2.24.1-r1.ebuild, + +gnome-settings-daemon-2.24.1-r2.ebuild, + +files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch: + Add patch for gnome-desktop API compatibility, to ease upgrade, bug + #269366 *gnome-settings-daemon-2.26.1-r1 (10 May 2009) 10 May 2009; Gilles Dartiguelongue <eva@gentoo.org> -gnome-settings-daemon-2.22.2.1.ebuild, +gnome-settings-daemon-2.26.1-r1.ebuild: - New version for GNOME 2.26. Pulseaudion support and lots of fixes. Clean + New version for GNOME 2.26. Pulseaudio support and lots of fixes. Clean up old revisions. 28 Apr 2009; Raúl Porcel <armin76@gentoo.org> diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index b245080195a4..1148cfdc29cb 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,19 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gnome-settings-daemon-2.24.0-automagic.patch 1656 RMD160 895fe60a74854d14229fa81fb534dc2379b3de8c SHA1 dfbfdc227104cc4339e8ff4c5bc8d3208a18f09c SHA256 ebf248ccbe911200ff256df37345f07c2291caf165b16331e6916ccf24be003d AUX gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch 721 RMD160 0a852a0d0027d05b6086e69cc41468edf5d82192 SHA1 07f8e843740d145cc2fc0dd328435586567fbcb9 SHA256 03d5f3e46baff9f4472410e0d2a58477908af23de2148cb3cd9b202121b60663 +AUX gnome-settings-daemon-2.24.1-gnomedesktop-api.patch 2873 RMD160 8545d4e60fdc72f4153732eadfb93aecee282aed SHA1 e0711aa4382ce93b38a50357530371014a3e6de4 SHA256 9c569aaa2bd9c48771c3c13768a071c3dc999abb0def0e6cac59c7f1976a9996 DIST gnome-settings-daemon-2.24.1.tar.bz2 1131518 RMD160 27d432cd217a836fcef0deac5f80f638a73cda7c SHA1 d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3 SHA256 a2a5132a5b9d0bef52010ea45b14560b6344f591ce3296ed555165332cce9a70 DIST gnome-settings-daemon-2.26.1-readd-gst-vol-control-support.patch.bz2 7669 RMD160 dc616c73606981af7f47e01973d2f1881fceed04 SHA1 e0194dc45dbfd57da9eead92f4c9c0e586f8eb9f SHA256 4bb694a0ea484c6d74baf2e252c6e9ddb153a3467b480fe55ba18373312fda81 DIST gnome-settings-daemon-2.26.1.tar.bz2 1084129 RMD160 5cca5fdcbf144d6fc950c5b5f7d5f1304168f4bd SHA1 0c2cef37a0a3333c314a8205cefea9edb8f0669a SHA256 4dff1daa84fe485e302f61286df1dd188292302ee792ddb4fb1c34e65aea0a80 -EBUILD gnome-settings-daemon-2.24.1-r1.ebuild 2366 RMD160 b4fd68bfbb5cc0a33e30f7fc0652820f3861cd43 SHA1 3b8c4c3e50cb63b3c598d65c44588ed67e395366 SHA256 48854416d3e9ad841d75e18980b14a2f06ecc296733b1b101a8fedc89aa8dd24 +EBUILD gnome-settings-daemon-2.24.1-r1.ebuild 2363 RMD160 38bc5f8149de5412f7fce43c20c9b13501fe4309 SHA1 f8dbbab0c282c71176129f3bc85fbe685ae3294f SHA256 e28d03cf7d5072a45f41ff2719636fbf3d2312f8f3a4ad13c8397b0711358379 +EBUILD gnome-settings-daemon-2.24.1-r2.ebuild 2485 RMD160 f199f30fbfa80d327df97767dd48c71464fb00c4 SHA1 9ce352b48397b331f770bf44bda5d1b94872508e SHA256 34ad7c160fe38367a5248f45ea6bea49d523f53f8e78b84fa82d8da6f1b0edf0 EBUILD gnome-settings-daemon-2.26.1-r1.ebuild 1925 RMD160 f6f201130a8eeb65fa7100376c040660b329253b SHA1 5c32a8c9825f008efa61b537d2d4d9d6e858938c SHA256 2aa683669ffd4bdbea8f7be3f225d9994ceb45c9c6a6d7a7f82f44e0868480da -MISC ChangeLog 5540 RMD160 52fb8a4518d481eb7ae523ebba7bc205f80b26f7 SHA1 0f8e80f5effe5d48a8eba942844dfd4be0844fdd SHA256 6471b13187d556c80a7789f833088f6a72f7fd75a01af3994845eb5ebc09deae +MISC ChangeLog 5869 RMD160 79c60402f24f6a47f3db7d413bf05ef4175b1495 SHA1 15f1fa17287f6a2fa585c8d9c1322d3c346a4d79 SHA256 a947c1308eb426e1d8164e47905457bca9a34e438cc60bcce7fffb90052c85df MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkoHXNUACgkQ1fmVwcYIWAZiBQCdFKREm/376cIOSJYqt/EaXzXo -H8oAn2NbkDa/fVRmewoksR75sgvXTl/1 -=1FvC ------END PGP SIGNATURE----- diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch new file mode 100644 index 000000000000..6e771a579303 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-gnomedesktop-api.patch @@ -0,0 +1,62 @@ +Allow building against gnome-desktop-2.26. + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524253 +https://bugs.gentoo.org/show_bug.cgi?id=269366 + +--- a/plugins/xrandr/gsd-xrandr-manager.c 2009-04-16 10:08:15.904851080 +0200 ++++ b/plugins/xrandr/gsd-xrandr-manager.c 2009-04-16 10:14:24.334003102 +0200 +@@ -118,7 +118,7 @@ on_client_message (GdkXEvent *xevent, + ev->type == ClientMessage && + ev->xclient.message_type == gnome_randr_xatom ()) { + +- gnome_rr_config_apply_stored (screen); ++ gnome_rr_config_apply_stored (screen, NULL); + + return GDK_FILTER_REMOVE; + } +@@ -146,7 +146,7 @@ event_filter (GdkXEvent *xeven + /* FIXME: here we should cycle between valid + * configurations, and save them + */ +- gnome_rr_config_apply_stored (manager->priv->rw_screen); ++ gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL); + + return GDK_FILTER_CONTINUE; + } +@@ -391,7 +391,7 @@ get_allowed_rotations_for_output (GsdXra + + output->rotation = rotation_to_test; + +- if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen)) { ++ if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen, NULL)) { + (*out_num_rotations)++; + (*out_rotations) |= rotation_to_test; + } +@@ -456,7 +456,7 @@ output_rotation_item_activate_cb (GtkChe + + error = NULL; + if (gnome_rr_config_save (priv->configuration, &error)) { +- if (!gnome_rr_config_apply_stored (priv->rw_screen)) { ++ if (!gnome_rr_config_apply_stored (priv->rw_screen, NULL)) { + error_dialog (_("The selected rotation could not be applied"), + _("An error occurred while configuring the screen")); + /* FIXME: that message is really useless. Make +@@ -694,7 +694,7 @@ gsd_xrandr_manager_start (GsdXrandrManag + g_debug ("Starting xrandr manager"); + + manager->priv->rw_screen = gnome_rr_screen_new ( +- gdk_screen_get_default (), on_randr_event, manager); ++ gdk_screen_get_default (), on_randr_event, manager, NULL); + + if (manager->priv->rw_screen == NULL) { + g_set_error (error, 0, 0, "Failed to initialize XRandR extension"); +@@ -728,7 +728,7 @@ gsd_xrandr_manager_start (GsdXrandrManag + gdk_error_trap_pop (); + } + +- gnome_rr_config_apply_stored (manager->priv->rw_screen); ++ gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL); + + gdk_window_add_filter (gdk_get_default_root_window(), + (GdkFilterFunc)event_filter, + diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild index bc6eca53de72..c931233d99f7 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 2008-2009 Gentoo Foundation +# Copyright 1999-2009 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.24.1-r1.ebuild,v 1.9 2009/04/28 11:48:44 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r1.ebuild,v 1.10 2009/06/17 22:56:53 eva Exp $ inherit autotools eutils gnome2 @@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.74 >=gnome-base/libglade-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 - >=gnome-base/gnome-desktop-2.23.90 + >=gnome-base/gnome-desktop-2.26 libnotify? ( >=x11-libs/libnotify-0.4.3 ) diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild new file mode 100644 index 000000000000..5de3fee786e5 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.24.1-r2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2009 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.24.1-r2.ebuild,v 1.1 2009/06/17 22:56:53 eva Exp $ + +inherit autotools eutils gnome2 + +DESCRIPTION="Gnome Settings Daemon" +HOMEPAGE="http://www.gnome.org" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="alsa debug esd gstreamer libnotify pulseaudio" + +RDEPEND=">=dev-libs/dbus-glib-0.74 + >=dev-libs/glib-2.18.0 + >=x11-libs/gtk+-2.10 + >=gnome-base/gconf-2.6.1 + >=gnome-base/libgnomekbd-2.21.4 + + >=gnome-base/libglade-2 + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + >=gnome-base/gnome-desktop-2.23.90 + + libnotify? ( >=x11-libs/libnotify-0.4.3 ) + + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXext + x11-libs/libXxf86misc + >=x11-libs/libxklavier-3.3 + media-libs/fontconfig + + esd? ( >=media-sound/esound-0.2.28 ) + gstreamer? ( + >=media-libs/gstreamer-0.10.1.2 + >=media-libs/gst-plugins-base-0.10.1.2 ) + !gstreamer? ( + alsa? ( >=media-libs/alsa-lib-0.99 ) )" +# In configure: gstreamer wins over alsa + +DEPEND="${RDEPEND} + !<gnome-base/gnome-control-center-2.22 + sys-devel/gettext + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.19 + x11-proto/inputproto + x11-proto/xproto" + +# FIXME: pulseaudio is used to detect if system should build +# old sound preference capplet (some braindead logic in there) +PDEPEND="pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )" + +# README is empty +DOCS="AUTHORS NEWS ChangeLog MAINTAINERS" + +pkg_setup() { + G2CONF="${G2CONF} + $(use_enable alsa) + $(use_enable debug) + $(use_enable esd) + $(use_enable gstreamer) + $(use_enable libnotify) + $(use_enable !pulseaudio legacy-sound-pref)" + # We use legacy-sound-pref instead of pulse because + # there is no gain in adding a build time dep on pulseaudio + + if use esd && use pulseaudio; then + ewarn "You selected conflicting USE flags. Please note that USE=\"esd\"" + ewarn "has no effect when USE=\"pulseaudio\" is selected." + fi +} + +src_unpack() { + gnome2_src_unpack + + # Fix libnotify & pulseaudio automagic dependencies + epatch "${FILESDIR}/${PN}-2.24.0-automagic.patch" + + # Fix server-side XInput detection (Gnome bug #562977) + epatch "${FILESDIR}/${PN}-2.24.1-check-for-server-side-XInput.patch" + + # Fix build with gnome-desktop-2.26, bug #269366 + epatch "${FILESDIR}/${PN}-2.24.1-gnomedesktop-api.patch" + + eautoreconf +} diff --git a/gnome-base/libghttp/ChangeLog b/gnome-base/libghttp/ChangeLog deleted file mode 100644 index 4f81519ce8b6..000000000000 --- a/gnome-base/libghttp/ChangeLog +++ /dev/null @@ -1,104 +0,0 @@ -# ChangeLog for gnome-base/libghttp -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libghttp/ChangeLog,v 1.28 2006/10/29 19:38:30 flameeyes Exp $ - - 29 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> - libghttp-1.0.9-r4.ebuild: - Add ~x86-fbsd keyword. - - 25 Feb 2006; John N. Laliberte <allanonjl@gentoo.org> - libghttp-1.0.9-r2.ebuild: - qa: fix description - - 27 Aug 2004; Tom Gall <tgall@gentoo.org> libghttp-1.0.9-r4.ebuild: - stable on ppc64, bug #59360 - - 12 Aug 2004; Travis Tilley <lv@gentoo.org> libghttp-1.0.9-r4.ebuild: - stable on amd64 - - 11 Jul 2004; <spider@gentoo.org> libghttp-1.0.9-r2.ebuild, - libghttp-1.0.9-r3.ebuild, libghttp-1.0.9-r4.ebuild: - IUSE added, repoamn clean. - - 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> - libghttp-1.0.9-r2.ebuild, libghttp-1.0.9-r3.ebuild, - libghttp-1.0.9-r4.ebuild: - virtual/glibc -> virtual/libc - - 29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> - libghttp-1.0.9-r3.ebuild, libghttp-1.0.9-r4.ebuild: - Masked libghttp-1.0.9-r4.ebuild stable for ppc - - 29 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> - libghttp-1.0.9-r3.ebuild: - Masked libghttp-1.0.9-r3.ebuild stable for ppc - - 26 May 2004; Guy Martin <gmsoft@gentoo.org> libghttp-1.0.9-r4.ebuild: - Marked stable on hppa. - - 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> libghttp-1.0.9-r4.ebuild: - Add inherit eutils - - 25 Feb 2004; Joshua Kinard <kumba@gentoo.org> libghttp-1.0.9-r4.ebuild: - Added ~mips to KEYWORDS to satisfy repoman deps. - - 20 Jan 2004; <gustavoz@gentoo.org> libghttp-1.0.9-r4.ebuild: - stable on sparc - - 08 Jan 2004; <agriffis@gentoo.org> libghttp-1.0.9-r4.ebuild: - stable on alpha and ia64 - -*libghttp-1.0.9-r4 (06 Dec 2003) - - 06 Dec 2003; foser <foser@gentoo.org> libghttp-1.0.9-r4.ebuild : - Added patch to fix locale related problem, described in bug #33386 - - 27 Oct 2003; Brad House <brad_mssw@gentoo.org> libghttp-1.0.9-r3.ebuild: - add amd64 flag - -*libghttp-1.0.9-r3 (24 Jan 2003) - - 06 Jul 2003; Guy Martin <gmsoft@gentoo.org> libghttp-1.0.9-r3.ebuild : - Added hppa to KEYWORDS. - - 30 Mar 2003; foser <foser@gentoo.org> libghttp-1.0.9-r3.ebuild : - streamlined it a bit (use econf/einstall) - - 25 Mar 2003; Aron Griffis <agriffis@gentoo.org> libghttp-1.0.9-r3.ebuild: - Add ~alpha to KEYWORDS - - 09 Mar 2003; Aron Griffis <agriffis@gentoo.org> libghttp-1.0.9-r3.ebuild: - Mark stable on alpha - - 07 Feb 2003; Aron Griffis <agriffis@gentoo.org> libghttp-1.0.9-r3.ebuild : - Add ~alpha to KEYWORDS - - 24 Jan 2003; foser <foser@gentoo.org> libghttp-1.0.9-r3.ebuild : - Now copies extra headers needed for intermezzo (#11501) - Now uses gnome.org eclass, fixed LICENSE - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - - 12 Aug 2002; Mark Guertin <gerk@gentoo.org> libghttp-1.0.9-r2.ebuild : - Added ppc to keywords - - 09 Jun 2002; Martin Schlemmer <azarah@gentoo.org> libghttp-1.0.9-r2 : - - Libtoolized this one, as I had problems which libtoolize fixed with - new install. - -*libghttp-1.0.9-r2 (21 Mar 2002) - - 21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> libghttp-1.0.9-r2.ebuild : - - HTML documentation no longer gzipped. Reported by: stefan@mdy.univie.ac.at - -*libghttp-1.0.9-r1 (1 Feb 2002) - - 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/gnome-base/libghttp/Manifest b/gnome-base/libghttp/Manifest deleted file mode 100644 index 4c76d8a7fae7..000000000000 --- a/gnome-base/libghttp/Manifest +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX libghttp-1.0.9-fixlocale.patch 1482 RMD160 7db48ab83c67eb1388df63874027d2eaeedd1f29 SHA1 d71b7f1cef83a8fe0d4c5aa5a32dce8e5c85d06e SHA256 580ca894a2572a8f9049aafd7a3f3bbe49ba6e1044ec93627f31cd6f64ccddc8 -DIST libghttp-1.0.9.tar.gz 147094 RMD160 89e54f680774136bd04721d053a01356f54404fe SHA1 666cbf89be2a5c331693c97f8f17ff39e94bb23f SHA256 ff8d3d4e43c9ef45d8ebd70664d00320f217be86800174efb1b32ef2affb0c85 -EBUILD libghttp-1.0.9-r4.ebuild 886 RMD160 955a7b04b799676374003a7851d6792c67f5daf2 SHA1 bd753676b65b1ab6fd119af6ebf3b5549aba3eff SHA256 eee338dddc2376a87639d0323c4e05e280b8000c3c9280946dbc29d5c8c80789 -MISC ChangeLog 3712 RMD160 cc8664cc84266c5981f3b7bbd52aeb33728b7b3c SHA1 2f8efbe4ad47e062c5657ab8f5ec1aab3d48ff01 SHA256 0cbb0f30b1dcae4894d5f906c0b99766afbcaf4a60d9cf259b7dc6a95f89dc17 -MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.8 (GNU/Linux) - -iEYEARECAAYFAkfVhmgACgkQkeYb6olFHJf8iwCeN2mK9BA/M2F3AxHzMVKwtmoe -WkQAnjR5XhuXFjlj1IwxYpDVG56+e3px -=UvYW ------END PGP SIGNATURE----- diff --git a/gnome-base/libghttp/files/libghttp-1.0.9-fixlocale.patch b/gnome-base/libghttp/files/libghttp-1.0.9-fixlocale.patch deleted file mode 100644 index 595b431711da..000000000000 --- a/gnome-base/libghttp/files/libghttp-1.0.9-fixlocale.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: gnome-http/http_req.c -diff -u gnome-http/http_req.c:1.24 gnome-http/http_req.c:1.25 ---- gnome-http/http_req.c:1.24 Sat Dec 2 13:45:35 2000 -+++ gnome-http/http_req.c Sat May 12 16:35:46 2001 -@@ -108,6 +108,7 @@ - int l_headers_len = 0; - int l_rv = 0; - char *l_content = NULL; -+ int l_ver_major, l_ver_minor; - - /* see if we need to jump into the function somewhere */ - if (a_conn->sync == HTTP_TRANS_ASYNC) -@@ -125,21 +126,25 @@ - memset(l_request, 0, 30 + strlen(a_req->resource) + (a_conn->proxy_host ? - (strlen(a_req->host) + 20) : 0)); - /* copy it into the buffer */ -+ l_ver_major = (int)a_req->http_ver; -+ l_ver_minor = ((int)(a_req->http_ver*10.0)) % 10; - if (a_conn->proxy_host) - { - l_request_len = sprintf(l_request, -- "%s %s HTTP/%01.1f\r\n", -+ "%s %s HTTP/%d.%d\r\n", - http_req_type_char[a_req->type], - a_req->full_uri, -- a_req->http_ver); -+ l_ver_major, -+ l_ver_minor); - } - else - { - l_request_len = sprintf(l_request, -- "%s %s HTTP/%01.1f\r\n", -+ "%s %s HTTP/%d.%d\r\n", - http_req_type_char[a_req->type], - a_req->resource, -- a_req->http_ver); -+ l_ver_major, -+ l_ver_minor); - } - /* set the request in the connection buffer */ - http_trans_append_data_to_buf(a_conn, l_request, l_request_len); diff --git a/gnome-base/libghttp/libghttp-1.0.9-r4.ebuild b/gnome-base/libghttp/libghttp-1.0.9-r4.ebuild deleted file mode 100644 index e2ecbeab79e4..000000000000 --- a/gnome-base/libghttp/libghttp-1.0.9-r4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libghttp/libghttp-1.0.9-r4.ebuild,v 1.15 2008/03/10 19:05:45 leio Exp $ - -GNOME_TARBALL_SUFFIX="gz" -inherit libtool gnome.org eutils - -DESCRIPTION="GNOME http client library" -LICENSE="LGPL-2 GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" - -HOMEPAGE="http://www.gnome.org/" - -DEPEND="virtual/libc" -IUSE="" - -src_unpack() { - - unpack ${A} - - cd "${S}" - # fixes http locale related bug (#33386) - epatch "${FILESDIR}/${P}-fixlocale.patch" - -} - -src_compile() { - - elibtoolize - - econf || die - emake || die - -} - -src_install() { - einstall || die - - # headers needed for Intermezzo (bug 11501) - insinto /usr/include/ghttp-1.0/ - doins http*.h - - dodoc AUTHORS COPYING* ChangeLog README NEWS TODO - dohtml doc/*.html -} diff --git a/gnome-base/libghttp/metadata.xml b/gnome-base/libghttp/metadata.xml deleted file mode 100644 index da6fd63d0085..000000000000 --- a/gnome-base/libghttp/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>gnome</herd> -</pkgmetadata> |