summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Ferri <mescalinum@gentoo.org>2008-11-16 15:57:55 +0000
committerFederico Ferri <mescalinum@gentoo.org>2008-11-16 15:57:55 +0000
commit85a5d5d29e017ab480643bc649f81b46e26117ce (patch)
treed7cc76ea5fe27c842f84b68e2807324a251d105a /app-pda
parentAdd fix for --as-needed reported in bug #247050. Thanks to Diego Pettenò <fl... (diff)
downloadgentoo-2-85a5d5d29e017ab480643bc649f81b46e26117ce.tar.gz
gentoo-2-85a5d5d29e017ab480643bc649f81b46e26117ce.tar.bz2
gentoo-2-85a5d5d29e017ab480643bc649f81b46e26117ce.zip
fix pkg collision with app-pda/synce-serial, bug 246675
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-pda')
-rw-r--r--app-pda/synce-hal/ChangeLog6
-rw-r--r--app-pda/synce-hal/synce-hal-0.1.ebuild5
-rw-r--r--app-pda/synce-hal/synce-hal-0.2.ebuild5
3 files changed, 13 insertions, 3 deletions
diff --git a/app-pda/synce-hal/ChangeLog b/app-pda/synce-hal/ChangeLog
index de27d6326a6b..e91454bee89a 100644
--- a/app-pda/synce-hal/ChangeLog
+++ b/app-pda/synce-hal/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-pda/synce-hal
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/synce-hal/ChangeLog,v 1.1 2008/11/13 00:05:09 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/synce-hal/ChangeLog,v 1.2 2008/11/16 15:57:55 mescalinum Exp $
+
+ 16 Nov 2008; Federico Ferri <mescalinum@gentoo.org> synce-hal-0.1.ebuild,
+ synce-hal-0.2.ebuild:
+ fix pkg collision with app-pda/synce-serial, bug 246675
*synce-hal-0.2 (13 Nov 2008)
*synce-hal-0.1 (13 Nov 2008)
diff --git a/app-pda/synce-hal/synce-hal-0.1.ebuild b/app-pda/synce-hal/synce-hal-0.1.ebuild
index 67774d0389a3..64f46974887f 100644
--- a/app-pda/synce-hal/synce-hal-0.1.ebuild
+++ b/app-pda/synce-hal/synce-hal-0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/synce-hal/synce-hal-0.1.ebuild,v 1.2 2008/11/13 16:54:54 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/synce-hal/synce-hal-0.1.ebuild,v 1.3 2008/11/16 15:57:55 mescalinum Exp $
DESCRIPTION="SynCE - hal connection manager"
HOMEPAGE="http://sourceforge.net/projects/synce/"
@@ -26,5 +26,8 @@ SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
src_install() {
make DESTDIR="${D}" install || die
+ # fix collision with app-pda/synce-serial, bug 246675
+ rm "${D}/usr/libexec/synce-serial-chat"
+
dodoc AUTHORS README ChangeLog
}
diff --git a/app-pda/synce-hal/synce-hal-0.2.ebuild b/app-pda/synce-hal/synce-hal-0.2.ebuild
index 21b9ba080f90..1e999015eacd 100644
--- a/app-pda/synce-hal/synce-hal-0.2.ebuild
+++ b/app-pda/synce-hal/synce-hal-0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/synce-hal/synce-hal-0.2.ebuild,v 1.2 2008/11/13 16:54:54 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/synce-hal/synce-hal-0.2.ebuild,v 1.3 2008/11/16 15:57:55 mescalinum Exp $
DESCRIPTION="SynCE - hal connection manager"
HOMEPAGE="http://sourceforge.net/projects/synce/"
@@ -26,5 +26,8 @@ SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
src_install() {
make DESTDIR="${D}" install || die
+ # fix collision with app-pda/synce-serial, bug 246675
+ rm "${D}/usr/libexec/synce-serial-chat"
+
dodoc AUTHORS README ChangeLog
}