From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SOYqr-00033v-6H for garchives@archives.gentoo.org; Sun, 29 Apr 2012 18:28:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30E92E072D; Sun, 29 Apr 2012 18:27:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EFBA0E072D for ; Sun, 29 Apr 2012 18:27:40 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09C7F1B4014 for ; Sun, 29 Apr 2012 18:27:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C0207E5403 for ; Sun, 29 Apr 2012 18:27:38 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1335724020.bcaf2fbb854b1fffc004ff9094050526fadc8f81.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdm/files/, kde-base/kdm/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdm/files/kdm-4.8.2-grub2.patch kde-base/kdm/kdm-4.8.49.9999.ebuild kde-base/kdm/kdm-9999.ebuild X-VCS-Directories: kde-base/kdm/files/ kde-base/kdm/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: bcaf2fbb854b1fffc004ff9094050526fadc8f81 X-VCS-Branch: master Date: Sun, 29 Apr 2012 18:27:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9a88e155-330e-424f-a8d3-62f3dc81992a X-Archives-Hash: be7059c4996250298a1ce0b8190358e8 commit: bcaf2fbb854b1fffc004ff9094050526fadc8f81 Author: Michael Palimaka astralcloak net> AuthorDate: Sun Apr 29 18:27:00 2012 +0000 Commit: Michael Palimaka astralcloak net> CommitDate: Sun Apr 29 18:27:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dbcaf2fbb [kde-base/kdm] Remove Grub2 patch, since a fix has been applied upstream. (Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit) --- kde-base/kdm/files/kdm-4.8.2-grub2.patch | 14 -------------- kde-base/kdm/kdm-4.8.49.9999.ebuild | 1 - kde-base/kdm/kdm-9999.ebuild | 1 - 3 files changed, 0 insertions(+), 16 deletions(-) diff --git a/kde-base/kdm/files/kdm-4.8.2-grub2.patch b/kde-base/kdm/file= s/kdm-4.8.2-grub2.patch deleted file mode 100644 index d48bd10..0000000 --- a/kde-base/kdm/files/kdm-4.8.2-grub2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -uNr kdm-4.8.2_orig/kdm/backend/bootman.c kdm-4.8.2/kdm/backend/boo= tman.c ---- kdm-4.8.2_orig/kdm/backend/bootman.c 2012-03-30 05:02:31.000000000 += 0700 -+++ kdm-4.8.2/kdm/backend/bootman.c 2012-04-26 09:33:58.683462475 +0700 -@@ -224,8 +224,8 @@ - static int - getGrub2(char ***opts, int *def, int *cur) - { -- grubConfig =3D "/boot/grub/grub.cfg"; -- return getGrub2OrBurg(opts, def, cur, "grub-reboot"); -+ grubConfig =3D "/boot/grub2/grub.cfg"; -+ return getGrub2OrBurg(opts, def, cur, "grub2-reboot"); - } -=20 - static int diff --git a/kde-base/kdm/kdm-4.8.49.9999.ebuild b/kde-base/kdm/kdm-4.8.4= 9.9999.ebuild index 36cb1d4..93e9fec 100644 --- a/kde-base/kdm/kdm-4.8.49.9999.ebuild +++ b/kde-base/kdm/kdm-4.8.49.9999.ebuild @@ -40,7 +40,6 @@ KMEXTRA=3D" PATCHES=3D( "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" - "${FILESDIR}/${PN}-4.8.2-grub2.patch" ) =20 pkg_setup() { diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild index 36cb1d4..93e9fec 100644 --- a/kde-base/kdm/kdm-9999.ebuild +++ b/kde-base/kdm/kdm-9999.ebuild @@ -40,7 +40,6 @@ KMEXTRA=3D" PATCHES=3D( "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" - "${FILESDIR}/${PN}-4.8.2-grub2.patch" ) =20 pkg_setup() {