From 16f4d9751cd34f5db30934911d9f27ec95470ce0 Mon Sep 17 00:00:00 2001 From: Julien Durillon Date: Tue, 24 Jan 2012 09:59:28 +0100 Subject: Update patches for gnome-settings-daemon --- .../files/0001-Make-colord-optional.patch | 64 ++++++++++------------ .../files/0002-Disable-wacom.patch | 42 ++++++++++++++ 2 files changed, 72 insertions(+), 34 deletions(-) create mode 100644 gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch diff --git a/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch b/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch index e57d21f6..ce7a15af 100644 --- a/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch +++ b/gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch @@ -1,12 +1,8 @@ -From a70d512823b818f46ddb40213c2658100d4cadc0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Thu, 27 Oct 2011 23:30:41 -0400 -Subject: [PATCH] Make colord optional +From b935fd8c7e0452b96e35712054a86899652bb7a4 Mon Sep 17 00:00:00 2001 +From: Julien Durillon +Date: Mon, 23 Jan 2012 15:50:20 +0100 +Subject: [PATCH 1/2] Make colord optional -Conflicts: - - configure.ac - plugins/Makefile.am --- configure.ac | 38 ++++++++++++++++++++++++++++++++------ data/Makefile.am | 7 ++++++- @@ -14,10 +10,10 @@ Conflicts: 3 files changed, 44 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac -index 08b1a2f..4f6f75f 100644 +index a07d422..63f1158 100644 --- a/configure.ac +++ b/configure.ac -@@ -105,6 +105,38 @@ dnl --------------------------------------------------------------------------- +@@ -99,6 +99,38 @@ dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) dnl --------------------------------------------------------------------------- @@ -25,18 +21,18 @@ index 08b1a2f..4f6f75f 100644 +dnl --------------------------------------------------------------------------- +build_color=false +AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [turn off color plugin]), -+ [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 ++ AC_HELP_STRING([--disable-color], ++ [turn off color plugin]), ++ [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, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) -+ build_color=true ++ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) ++ build_color=true +fi +AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") + @@ -48,29 +44,29 @@ index 08b1a2f..4f6f75f 100644 +dnl --------------------------------------------------------------------------- +PKG_CHECK_MODULES(LIBCANBERRA, libcanberra-gtk3, + [have_libcanberra=true -+ AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define if libcanberra should be used])], -+ [have_libcanberra=false]) ++ AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define if libcanberra should be used)], ++ [have_libcanberra=false]) +AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xtrue") + +dnl --------------------------------------------------------------------------- dnl - Check for LCMS2 dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, have_new_lcms=yes, have_new_lcms=no) -@@ -219,12 +251,6 @@ dnl --------------------------------------------------------------------------- - - PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra gconf-2.0 >= $GCONF_REQUIRED_VERSION]) +@@ -196,12 +228,6 @@ dnl --------------------------------------------------------------------------- + PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra]) --dnl --------------------------------------------------------------------------- + dnl --------------------------------------------------------------------------- -dnl - color -dnl --------------------------------------------------------------------------- - -PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) - - dnl ============================================== - dnl PackageKit section - dnl ============================================== +-dnl --------------------------------------------------------------------------- + dnl - wacom + dnl --------------------------------------------------------------------------- + diff --git a/data/Makefile.am b/data/Makefile.am -index 43ba27c..1f3bbef 100644 +index 19decc2..cb2c976 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -11,7 +11,6 @@ gsettings_SCHEMAS = \ @@ -95,7 +91,7 @@ index 43ba27c..1f3bbef 100644 gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml else diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 83d223a..ad88aa9 100644 +index 2b7566a..31fcb74 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -6,7 +6,6 @@ enabled_plugins = \ @@ -104,9 +100,9 @@ index 83d223a..ad88aa9 100644 clipboard \ - color \ cursor \ - datetime \ dummy \ -@@ -23,6 +22,12 @@ enabled_plugins = \ + power \ +@@ -22,6 +21,12 @@ enabled_plugins = \ disabled_plugins = $(NULL) @@ -120,5 +116,5 @@ index 83d223a..ad88aa9 100644 enabled_plugins += updates else -- -1.7.8.rc0.dirty +1.7.9.rc2 diff --git a/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch b/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch new file mode 100644 index 00000000..6ffcf585 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch @@ -0,0 +1,42 @@ +From 9e97002b4c9149c480ce996071cba9c058a7546a Mon Sep 17 00:00:00 2001 +From: Julien Durillon +Date: Mon, 23 Jan 2012 15:51:36 +0100 +Subject: [PATCH 2/2] remove wacom support + +--- + configure.ac | 6 ------ + plugins/Makefile.am | 1 - + 2 files changed, 0 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 63f1158..d73e5d9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -227,12 +227,6 @@ dnl --------------------------------------------------------------------------- + + PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra]) + +-dnl --------------------------------------------------------------------------- +-dnl - wacom +-dnl --------------------------------------------------------------------------- +- +-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION]) +- + dnl ============================================== + dnl PackageKit section + dnl ============================================== +diff --git a/plugins/Makefile.am b/plugins/Makefile.am +index 31fcb74..e40d9b9 100644 +--- a/plugins/Makefile.am ++++ b/plugins/Makefile.am +@@ -14,7 +14,6 @@ enabled_plugins = \ + media-keys \ + mouse \ + sound \ +- wacom \ + xrandr \ + xsettings \ + $(NULL) +-- +1.7.9.rc2 + -- cgit v1.2.3-65-gdbad From 455890aefe3502883ef7db59e7c263e7f81fb83f Mon Sep 17 00:00:00 2001 From: Julien Durillon Date: Tue, 24 Jan 2012 15:32:41 +0100 Subject: With gsd manifest --- gnome-base/gnome-settings-daemon/Manifest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index f4b37713..b2838960 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,3 +1,3 @@ -AUX 0001-Make-colord-optional.patch 4497 RMD160 cb26ecd2232118120f9675c9215e0248fe6b652a SHA1 570bde3786a6ae1a270ea792a15cfbe537e0381c SHA256 59f1cdbe53161e2a57037ab8c4a0a53e67b5e39c2fdf840bb7d3023d174a88e6 -AUX 0002-Disable-wacom.patch 1389 RMD160 3add8c49da1c54adaf8bd55a1c7d420db4c98903 SHA1 5347bef5683a6d3aca7d497b5761aa955e46beff SHA256 6ac2a235419b3126c7afaf22275457e34928f8453a09c403de75601eec70532d +AUX 0001-Make-colord-optional.patch 4478 RMD160 529706d5972e815187d7d6569637ccdabc3daade SHA1 8e4a1a65d04f14c0b8c21f783579f48757502445 SHA256 4385e27c12e881e79b838668308eb38c46ef6f170c91534b3c81b91e675b5728 +AUX 0002-Disable-wacom.patch 1395 RMD160 052c221717981b6276c0636946c5f4e28ef9dbba SHA1 84ab2cc737aa24c1cf771536729a140479583b33 SHA256 801e92ecdb5cc4e32cd39a5fc8e73bd5ec69e4338f50d6d98bdb1aa1f4bca9eb EBUILD gnome-settings-daemon-9999-r1.ebuild 3512 RMD160 23d8205e06151842af123c496592cd5c346d8d0c SHA1 d5638f1f60f54b94194adc4c8fa4a31f9ee9aee8 SHA256 736aa9f4e28b94a69e4f1748da2bb26b6cc099aaa1bf753bc836653d8b1cc68e -- cgit v1.2.3-65-gdbad From 7109b09951f311367a2aec4fea3084c0f0a6f53b Mon Sep 17 00:00:00 2001 From: Julien Durillon Date: Tue, 24 Jan 2012 16:01:27 +0100 Subject: Fix systemd git url --- sys-apps/systemd/Manifest | 2 +- sys-apps/systemd/systemd-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index d106c2d7..717a4533 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1 +1 @@ -EBUILD systemd-9999.ebuild 4362 RMD160 5b9855c95fe77077b49101601ced0178acb1eb79 SHA1 cfcfa295b7d2af03487489f896608a7d81d84f01 SHA256 7b73363d01ff2ce8d0335a3f172fc3dd1050ad9438d425affbb757a510697087 +EBUILD systemd-9999.ebuild 4370 RMD160 690e9e13380bb6eeeb6ff6c73df5cee5d2964d6f SHA1 e8d2d0798b32ea579b5d1e96a8214f9110d77f50 SHA256 579b8161a41f8a0ec95b63455218a6af24b791780fbd6c82d04d6c6932f3e0ca diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 2df3c64b..63455f84 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -9,7 +9,7 @@ inherit autotools bash-completion-r1 git-2 linux-info pam systemd DESCRIPTION="System and service manager for Linux" HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" -EGIT_REPO_URI="git://anongit.freedesktop.org/systemd" +EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" LICENSE="GPL-2" SLOT="0" -- cgit v1.2.3-65-gdbad From d2a6ee126b5c5d69590c88772a0a8cfd8363853a Mon Sep 17 00:00:00 2001 From: Julien Durillon Date: Tue, 31 Jan 2012 15:10:34 +0100 Subject: Bump dev-util/idea-community. To version 11. --- dev-util/idea-community/Manifest | 4 +-- .../idea-community-10.5.2.107.587.ebuild | 38 ---------------------- .../idea-community-11.0.1.111.167.ebuild | 38 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 dev-util/idea-community/idea-community-10.5.2.107.587.ebuild create mode 100644 dev-util/idea-community/idea-community-11.0.1.111.167.ebuild diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest index ef0f5881..c2d334d8 100644 --- a/dev-util/idea-community/Manifest +++ b/dev-util/idea-community/Manifest @@ -1,2 +1,2 @@ -DIST ideaIC-10.5.2.tar.gz 84691012 RMD160 250199ae714a2f1cce1c8e1d33eccbd8e6a67e60 SHA1 1d0405bf1d691e291672374e5b61aee0d5aa52c3 SHA256 a268c9929ee86825150ddbbb196a894d98c3ba6712258fbc7fbb4b733db18e78 -EBUILD idea-community-10.5.2.107.587.ebuild 992 RMD160 1e188cc586d7555e33b47986f66a4e1e8c67f694 SHA1 a20c222bde9105c03e4207e22fbb4ecd3a2ef82a SHA256 e4b67cb942deaf39888a0462e09acde2ad1680fb2df2f929b986cd5365fb9b4d +DIST ideaIC-11.0.1.tar.gz 98757381 RMD160 c017b33b45fff443d89d7f4675a3ebabd70331f5 SHA1 67290ff0a4fe02e5707527222d75324de72056fe SHA256 f0189a7b89f136ddd6bcfd9b4bf89353730cd2c67b57ec8acacfc0e5b757c8ab +EBUILD idea-community-11.0.1.111.167.ebuild 992 RMD160 1e188cc586d7555e33b47986f66a4e1e8c67f694 SHA1 a20c222bde9105c03e4207e22fbb4ecd3a2ef82a SHA256 e4b67cb942deaf39888a0462e09acde2ad1680fb2df2f929b986cd5365fb9b4d diff --git a/dev-util/idea-community/idea-community-10.5.2.107.587.ebuild b/dev-util/idea-community/idea-community-10.5.2.107.587.ebuild deleted file mode 100644 index 9fd6f74a..00000000 --- a/dev-util/idea-community/idea-community-10.5.2.107.587.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 -inherit eutils versionator - -SLOT="$(get_major_version)" -RDEPEND=">=virtual/jdk-1.6" - -MY_PV="$(get_version_component_range 4-5)" -MY_PN="idea" - -RESTRICT="strip" -QA_TEXTRELS="opt/${P}/bin/libbreakgen.so" - -DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE" -HOMEPAGE="http://jetbrains.com/idea/" -SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}IC-$(get_version_component_range 1-3).tar.gz" -LICENSE="IntelliJ-IDEA" -IUSE="" -KEYWORDS="~x86 ~amd64" -S="${WORKDIR}/${MY_PN}-IC-${MY_PV}" - -RDEPEND="!dev-util/idea-ultimate" - -src_install() { - local dir="/opt/${P}" - insinto "${dir}" - doins -r * - fperms 755 "${dir}/bin/${MY_PN}.sh" - local exe=${MY_PN}-${SLOT} - local icon=${exe}.png - newicon "bin/${MY_PN}_CE32.png" ${icon} - dodir /usr/bin - make_wrapper "$exe" "/opt/${P}/bin/${MY_PN}.sh" - make_desktop_entry ${exe} "IntelliJ IDEA ${PV}" ${icon} "Development;IDE" -} diff --git a/dev-util/idea-community/idea-community-11.0.1.111.167.ebuild b/dev-util/idea-community/idea-community-11.0.1.111.167.ebuild new file mode 100644 index 00000000..9fd6f74a --- /dev/null +++ b/dev-util/idea-community/idea-community-11.0.1.111.167.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit eutils versionator + +SLOT="$(get_major_version)" +RDEPEND=">=virtual/jdk-1.6" + +MY_PV="$(get_version_component_range 4-5)" +MY_PN="idea" + +RESTRICT="strip" +QA_TEXTRELS="opt/${P}/bin/libbreakgen.so" + +DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE" +HOMEPAGE="http://jetbrains.com/idea/" +SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}IC-$(get_version_component_range 1-3).tar.gz" +LICENSE="IntelliJ-IDEA" +IUSE="" +KEYWORDS="~x86 ~amd64" +S="${WORKDIR}/${MY_PN}-IC-${MY_PV}" + +RDEPEND="!dev-util/idea-ultimate" + +src_install() { + local dir="/opt/${P}" + insinto "${dir}" + doins -r * + fperms 755 "${dir}/bin/${MY_PN}.sh" + local exe=${MY_PN}-${SLOT} + local icon=${exe}.png + newicon "bin/${MY_PN}_CE32.png" ${icon} + dodir /usr/bin + make_wrapper "$exe" "/opt/${P}/bin/${MY_PN}.sh" + make_desktop_entry ${exe} "IntelliJ IDEA ${PV}" ${icon} "Development;IDE" +} -- cgit v1.2.3-65-gdbad