From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-537822-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 9BBCB1381F3
for <garchives@archives.gentoo.org>; Sun, 23 Dec 2012 14:40:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3AD0CE0444;
Sun, 23 Dec 2012 14:40:43 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A04EDE0444
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Dec 2012 14:40:42 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7FE6D33D8A3
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Dec 2012 14:40:41 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 2238)
id 44E992171D; Sun, 23 Dec 2012 14:40:40 +0000 (UTC)
From: "Markos Chandras (hwoarang)" <hwoarang@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, hwoarang@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/libfm: libfm-9999.ebuild ChangeLog
X-VCS-Repository: gentoo-x86
X-VCS-Files: libfm-9999.ebuild ChangeLog
X-VCS-Directories: x11-libs/libfm
X-VCS-Committer: hwoarang
X-VCS-Committer-Name: Markos Chandras
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Message-Id: <20121223144040.44E992171D@flycatcher.gentoo.org>
Date: Sun, 23 Dec 2012 14:40:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3498bd66-7f98-4b39-a5e0-c1d55a29cf44
X-Archives-Hash: c133b24a174f6f30142e9af745357fa1
hwoarang 12/12/23 14:40:40
Modified: libfm-9999.ebuild ChangeLog
Log:
Rework broken symlink logic once again
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
Revision Changes Path
1.32 x11-libs/libfm/libfm-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?r1=1.31&r2=1.32
Index: libfm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libfm-9999.ebuild 2 Dec 2012 15:26:59 -0000 1.31
+++ libfm-9999.ebuild 23 Dec 2012 14:40:40 -0000 1.32
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.31 2012/12/02 15:26:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.32 2012/12/23 14:40:40 hwoarang Exp $
EAPI=5
@@ -50,6 +50,10 @@
sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" "${S}"/configure.ac || die
#Remove -Werror for automake-1.12. Bug #421101
sed -i "s:-Werror::" configure.ac || die
+ # Drop the symlink. We will create it later on. 439580
+ sed -i "/@LN_S@ @PACKAGE@-@FMLIBVER@/d" src/Makefile.am \
+ || die "failed to remove the includedir symlink"
+
eautoreconf
rm -r autom4te.cache || die
use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
@@ -71,10 +75,9 @@
src_install() {
default
find "${D}" -name '*.la' -exec rm -f '{}' +
- # Remove symlink #439570
- if [[ -h ${D}/usr/include/${PN} ]]; then
- rm "${D}"/usr/include/${PN}
- fi
+ # 439570
+ [[ -d ${D}/usr/include/${PN} ]] \
+ && rm -r ${D}/usr/include/${PN}
}
pkg_preinst() {
1.84 x11-libs/libfm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?r1=1.83&r2=1.84
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ChangeLog 2 Dec 2012 15:26:59 -0000 1.83
+++ ChangeLog 23 Dec 2012 14:40:40 -0000 1.84
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/libfm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.83 2012/12/02 15:26:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.84 2012/12/23 14:40:40 hwoarang Exp $
+
+ 23 Dec 2012; Markos Chandras <hwoarang@gentoo.org> libfm-9999.ebuild:
+ Rework broken symlink logic once again
02 Dec 2012; Markos Chandras <hwoarang@gentoo.org> libfm-9999.ebuild:
Move it to EAPI5 in order to use sub-slot deps for lxde-base/menu-cache