5 files changed, 19 insertions, 34 deletions
diff --git a/dev-python/astng/ChangeLog b/dev-python/astng/ChangeLog
index 181e2c8b6b6c..ddb5be2dd69c 100644
--- a/dev-python/astng/ChangeLog
+++ b/dev-python/astng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/astng
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/ChangeLog,v 1.5 2006/01/11 16:04:21 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/ChangeLog,v 1.6 2006/01/19 16:46:16 marienz Exp $
+
+  19 Jan 2006; Marien Zwart <marienz@gentoo.org> -astng-0.13.1.ebuild,
+  astng-0.14.0.ebuild:
+  Stop installing common/__init__.py and depend on a revbumped logilab-common
+  to ensure that "owns" the installed version of that file (bug #111970). Drop
+  old version.
 
 *astng-0.14.0 (11 Jan 2006)
 
diff --git a/dev-python/astng/Manifest b/dev-python/astng/Manifest
index 3a1bcc7f0bab..e3b9e829fd2c 100644
--- a/dev-python/astng/Manifest
+++ b/dev-python/astng/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f358a781a4cd26f4a95f3abb871f158d ChangeLog 855
-MD5 885197ad4a8a3e3cb4453c55f31499da astng-0.13.1.ebuild 515
-MD5 12ac2f0f05c2ef9024b68ba4bfb11a64 astng-0.14.0.ebuild 1310
-MD5 db05dcf4fe985e0e5fc9d14737bd5d23 files/digest-astng-0.13.1 63
+MD5 2490e90700f848c4af1a3be3cd00ae2c astng-0.14.0.ebuild 1590
 MD5 e0feadf16eb56c0c7e6a0821c3cd9827 files/digest-astng-0.14.0 63
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxSyYW78445TWHXcRArmxAKCUIkCIAnZrU7BpEn+rVosib3tFWQCgjVBy
-5gJmisiET/FBqnHX2CKhVG4=
-=znmm
------END PGP SIGNATURE-----
diff --git a/dev-python/astng/astng-0.13.1.ebuild b/dev-python/astng/astng-0.13.1.ebuild
deleted file mode 100644
index c7798253a938..000000000000
--- a/dev-python/astng/astng-0.13.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.13.1.ebuild,v 1.4 2006/01/08 20:22:34 nixnut Exp $
-
-inherit distutils
-
-DESCRIPTION="Abstract Syntax Tree New Generation for logilab packages"
-SRC_URI="ftp://ftp.logilab.org/pub/astng/${P}.tar.gz"
-HOMEPAGE="http://www.logilab.org/projects/astng/"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-DEPEND=">=dev-lang/python-2.1"
-
-
diff --git a/dev-python/astng/astng-0.14.0.ebuild b/dev-python/astng/astng-0.14.0.ebuild
index dbd350a521f0..6fd25c672d70 100644
--- a/dev-python/astng/astng-0.14.0.ebuild
+++ b/dev-python/astng/astng-0.14.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.14.0.ebuild,v 1.1 2006/01/11 16:04:21 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astng/astng-0.14.0.ebuild,v 1.2 2006/01/19 16:46:17 marienz Exp $
 
 inherit distutils
 
@@ -12,9 +12,18 @@ IUSE=""
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 LICENSE="GPL-2"
-DEPEND=">=dev-lang/python-2.1"
+DEPEND=">=dev-lang/python-2.1
+	>=dev-python/logilab-common-0.13-r1"
 
 
+src_install() {
+	distutils_src_install
+	python_version
+	# we need to remove this file because it collides with the one
+	# from logilab-common (which we depend on).
+	rm ${D}/usr/$(get_libdir)/python${PYVER}/site-packages/logilab/__init__.py
+}
+
 src_test() {
 	# The tests will not work properly from the source dir, so do a
 	# temporary install.
diff --git a/dev-python/astng/files/digest-astng-0.13.1 b/dev-python/astng/files/digest-astng-0.13.1
deleted file mode 100644
index 1a05d2548479..000000000000
--- a/dev-python/astng/files/digest-astng-0.13.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57b899fb6caf7b88f33161b89ee1e6fa astng-0.13.1.tar.gz 40351