Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2012-01-31 15:12:59 +0100
committerMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2012-01-31 15:12:59 +0100
commiteb6d10bc726652c961fe878ad131e8336bf5e05b (patch)
treef51bb9a8971ab97a1e5fd168aeb8a5771ebc5dcc
parentbump gpaste (diff)
parentBump dev-util/idea-community. (diff)
downloadkeruspe-eb6d10bc726652c961fe878ad131e8336bf5e05b.tar.gz
keruspe-eb6d10bc726652c961fe878ad131e8336bf5e05b.tar.bz2
keruspe-eb6d10bc726652c961fe878ad131e8336bf5e05b.zip
Merge git://github.com/Keruspe/Keruspe-overlay
* git://github.com/Keruspe/Keruspe-overlay: Bump dev-util/idea-community. Fix systemd git url With gsd manifest Update patches for gnome-settings-daemon
Diffstat
-rw-r--r--dev-util/idea-community/Manifest4
-rw-r--r--dev-util/idea-community/idea-community-11.0.1.111.167.ebuild (renamed from dev-util/idea-community/idea-community-10.5.2.107.587.ebuild)0
-rw-r--r--gnome-base/gnome-settings-daemon/Manifest4
-rw-r--r--gnome-base/gnome-settings-daemon/files/0001-Make-colord-optional.patch50
-rw-r--r--gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch21
-rw-r--r--sys-apps/systemd/Manifest2
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild2
7 files changed, 39 insertions, 44 deletions
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-11.0.1.111.167.ebuild
index 9fd6f74a..9fd6f74a 100644
--- a/dev-util/idea-community/idea-community-10.5.2.107.587.ebuild
+++ b/dev-util/idea-community/idea-community-11.0.1.111.167.ebuild
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
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 117b23f9..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 44c502e412fbcb99cea83ef7db7f9093e0637944 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 27 Oct 2011 23:30:41 -0400
+From b935fd8c7e0452b96e35712054a86899652bb7a4 Mon Sep 17 00:00:00 2001
+From: Julien Durillon <julien.durillon@gmail.com>
+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 bd5a8ce..a83f1a9 100644
+index a07d422..63f1158 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -97,6 +97,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 bd5a8ce..a83f1a9 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,15 +44,15 @@ index bd5a8ce..a83f1a9 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)
-@@ -212,12 +244,6 @@ dnl ---------------------------------------------------------------------------
+@@ -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 ---------------------------------------------------------------------------
@@ -70,7 +66,7 @@ index bd5a8ce..a83f1a9 100644
dnl ---------------------------------------------------------------------------
diff --git a/data/Makefile.am b/data/Makefile.am
-index bab7359..7f21a46 100644
+index 19decc2..cb2c976 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,7 +11,6 @@ gsettings_SCHEMAS = \
@@ -95,7 +91,7 @@ index bab7359..7f21a46 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.163.g9859a.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
index 204c9a54..6ffcf585 100644
--- a/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch
+++ b/gnome-base/gnome-settings-daemon/files/0002-Disable-wacom.patch
@@ -1,19 +1,18 @@
-From fa78cb1359e50c87e36f2422148120f605185aef Mon Sep 17 00:00:00 2001
-From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-Date: Mon, 12 Dec 2011 14:38:16 +0100
-Subject: [PATCH 2/2] Disable wacom
+From 9e97002b4c9149c480ce996071cba9c058a7546a Mon Sep 17 00:00:00 2001
+From: Julien Durillon <julien.durillon@gmail.com>
+Date: Mon, 23 Jan 2012 15:51:36 +0100
+Subject: [PATCH 2/2] remove wacom support
-Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---
configure.ac | 6 ------
plugins/Makefile.am | 1 -
2 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
-index a83f1a9..574d41e 100644
+index 63f1158..d73e5d9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -243,12 +243,6 @@ dnl ---------------------------------------------------------------------------
+@@ -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])
@@ -21,16 +20,16 @@ index a83f1a9..574d41e 100644
-dnl - wacom
-dnl ---------------------------------------------------------------------------
-
--PKG_CHECK_MODULES(WACOM, [libwacom x11 xi])
+-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 ad88aa9..9ce88f7 100644
+index 31fcb74..e40d9b9 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
-@@ -15,7 +15,6 @@ enabled_plugins = \
+@@ -14,7 +14,6 @@ enabled_plugins = \
media-keys \
mouse \
sound \
@@ -39,5 +38,5 @@ index ad88aa9..9ce88f7 100644
xsettings \
$(NULL)
--
-1.7.8.163.g9859a.dirty
+1.7.9.rc2
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"