From: Joshua Nichols <nichoj@gentoo.org>
Date: Sat, 3 Feb 2007 18:31:11 +0000 (+0000)
Subject: Fixed file collision. See bug #164780.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e12077259f0a71f2d703d019d1a00a55dcce2e0c;p=gentoo.git

Fixed file collision. See bug #164780.
Package-Manager: portage-2.1.2-r7
---

diff --git a/xfce-extra/exo/ChangeLog b/xfce-extra/exo/ChangeLog
index b13378e046c1..4fb40fd7582b 100644
--- a/xfce-extra/exo/ChangeLog
+++ b/xfce-extra/exo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-extra/exo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.28 2007/01/29 19:03:52 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.29 2007/02/03 18:31:11 nichoj Exp $
+
+  03 Feb 2007; Joshua Nichols <nichoj@gentoo.org> exo-0.3.2.ebuild:
+  Fixed file collision. See bug #164780.
 
   29 Jan 2007; Peter Weller <welp@gentoo.org> exo-0.3.2.ebuild:
   A number of fixes
diff --git a/xfce-extra/exo/Manifest b/xfce-extra/exo/Manifest
index ad46e8ccf62d..6dbfe0d39c41 100644
--- a/xfce-extra/exo/Manifest
+++ b/xfce-extra/exo/Manifest
@@ -17,14 +17,14 @@ EBUILD exo-0.3.1.12_rc2.ebuild 866 RMD160 187eb6989f45211cb81423a5661fa22c867d44
 MD5 893431789edc888a7302868269fa7a98 exo-0.3.1.12_rc2.ebuild 866
 RMD160 187eb6989f45211cb81423a5661fa22c867d4420 exo-0.3.1.12_rc2.ebuild 866
 SHA256 1d730fe8eec8574d39376f747585977755e3d1e34a8b9b46aa623e0bcb0a5bff exo-0.3.1.12_rc2.ebuild 866
-EBUILD exo-0.3.2.ebuild 1023 RMD160 96ba3dcc99b37b0fbe677ba9d28d4a0f23d2561d SHA1 f4bcdce1325b2adea3497634ea791d9239abb35b SHA256 09d252f62cab46e3293641765d281722af9c459c537a4e80e4f65cefee94f4c6
-MD5 ec013ef38d4f712565950bdcf4819387 exo-0.3.2.ebuild 1023
-RMD160 96ba3dcc99b37b0fbe677ba9d28d4a0f23d2561d exo-0.3.2.ebuild 1023
-SHA256 09d252f62cab46e3293641765d281722af9c459c537a4e80e4f65cefee94f4c6 exo-0.3.2.ebuild 1023
-MISC ChangeLog 3686 RMD160 536ec55e314cad42847a923229858cfbd4af20ec SHA1 3861f5390c7aa33f2d9a89e8d6a1012d70a7ec94 SHA256 0c228b9ee43ef34b6e05eadd1f0b7345b4b63f72a5d7726e59c0c8c5105e37be
-MD5 4dc194d2d8b866edfe334e54f81be6df ChangeLog 3686
-RMD160 536ec55e314cad42847a923229858cfbd4af20ec ChangeLog 3686
-SHA256 0c228b9ee43ef34b6e05eadd1f0b7345b4b63f72a5d7726e59c0c8c5105e37be ChangeLog 3686
+EBUILD exo-0.3.2.ebuild 1417 RMD160 5896f09122ed90a5f83f7b8d9bcdcde671605100 SHA1 2977d2e53de98e241c50b384e12e5eba90612b4c SHA256 015575ccf365711e7a413c485bf7b15f64c68e32e67a35f61868ea8c4d44bf18
+MD5 4c9b17675e559617a8b455be44b9f63c exo-0.3.2.ebuild 1417
+RMD160 5896f09122ed90a5f83f7b8d9bcdcde671605100 exo-0.3.2.ebuild 1417
+SHA256 015575ccf365711e7a413c485bf7b15f64c68e32e67a35f61868ea8c4d44bf18 exo-0.3.2.ebuild 1417
+MISC ChangeLog 3798 RMD160 7e392783149e98dd733027850e168925812a5eb7 SHA1 27183f8d5930b703fa932eacf72c10157ff23b2d SHA256 510d787c98dbdf22957034063b90b2939bb454e5b66b7d7399507c310aa392bd
+MD5 c04a40de63c178cfad5c04bba27a400c ChangeLog 3798
+RMD160 7e392783149e98dd733027850e168925812a5eb7 ChangeLog 3798
+SHA256 510d787c98dbdf22957034063b90b2939bb454e5b66b7d7399507c310aa392bd ChangeLog 3798
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
diff --git a/xfce-extra/exo/exo-0.3.2.ebuild b/xfce-extra/exo/exo-0.3.2.ebuild
index 3fa315460e72..0360a27fc071 100644
--- a/xfce-extra/exo/exo-0.3.2.ebuild
+++ b/xfce-extra/exo/exo-0.3.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.2.ebuild,v 1.3 2007/01/29 19:03:52 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.2.ebuild,v 1.4 2007/02/03 18:31:11 nichoj Exp $
 
-inherit xfce44
+inherit xfce44 python
 
 xfce44
-xfce44_extra_package
+xfce44_core_package
 
 DESCRIPTION="Extra library"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
@@ -32,4 +32,19 @@ XFCE_CONFIG="${XFCE_CONFIG}	$(use_enable python) \
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
 
-xfce44_core_package
+# See bug #164780 for reference
+src_install() {
+	xfce44_src_install
+	rm -f "${D}"/usr/lib*/python*/site-packages/pyexo.py[co]
+	rm -f "${D}"/usr/lib*/python*/site-packages/${PN}-0.3/${PN}/__init__.py[co]
+}
+
+pkg_postinst() {
+	xfce44_pkg_postinst
+	python_mod_optimize "${ROOT}"/usr/lib*/python*/site-packages
+}
+
+pkg_postrm() {
+	xfce44_pkg_postrm
+	python_mod_cleanup "${ROOT}"/usr/lib*/python*/site-packages
+}