solve conflict with uuidgen utility installed by sys-fs/e2fsprogs (#116699)

(Portage version: 2.0.53)

4 files changed, 26 insertions, 15 deletions

diff --git a/dev-libs/xplc/ChangeLog b/dev-libs/xplc/ChangeLog
index 16d069c05052..60ebb50858d7 100644
--- a/dev-libs/xplc/ChangeLog
+++ b/dev-libs/xplc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xplc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xplc/ChangeLog,v 1.28 2005/12/24 17:06:58 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xplc/ChangeLog,v 1.29 2005/12/28 09:59:25 mrness Exp $
+
+*xplc-0.3.13-r1 (28 Dec 2005)
+
+  28 Dec 2005; Alin Nastac <mrness@gentoo.org> -xplc-0.3.13.ebuild,
+  +xplc-0.3.13-r1.ebuild:
+  Solve conflict with uuidgen utility installed by sys-fs/e2fsprogs (#116699).
 
 *xplc-0.3.13 (24 Dec 2005)
 
diff --git a/dev-libs/xplc/Manifest b/dev-libs/xplc/Manifest
index 1480ab8c9db3..5821b9e83b77 100644
--- a/dev-libs/xplc/Manifest
+++ b/dev-libs/xplc/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 13fbee22bb0ee56d32a30068c5fddfec xplc-0.3.13.ebuild 734
-MD5 8d308f759d900a00afeacbc8abef5203 xplc-0.3.12.ebuild 731
 MD5 9df07dd988269bc291a68eaa53afbf37 ChangeLog 3010
-MD5 3a2a14e0cc76899541c876d92d3be23a metadata.xml 334
 MD5 09827bbe7062e63b20f540e649164c98 files/digest-xplc-0.3.12 63
 MD5 13fe34fdab0bbf6f71f095db20c7c390 files/digest-xplc-0.3.13 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDrYBCNSP4Vda7IdsRAj1KAJ41UhE8OPrjVXSyZI/18t8kUsjPzQCfV+LW
-udjBLqR7oeQsbPmNU2rFQQY=
-=9pms
------END PGP SIGNATURE-----
+MD5 13fe34fdab0bbf6f71f095db20c7c390 files/digest-xplc-0.3.13-r1 63
+MD5 3a2a14e0cc76899541c876d92d3be23a metadata.xml 334
+MD5 8d308f759d900a00afeacbc8abef5203 xplc-0.3.12.ebuild 731
+MD5 106989c49b4e740f148d4f400729ef84 xplc-0.3.13-r1.ebuild 1133
+MD5 13fbee22bb0ee56d32a30068c5fddfec xplc-0.3.13.ebuild 734
diff --git a/dev-libs/xplc/files/digest-xplc-0.3.13 b/dev-libs/xplc/files/digest-xplc-0.3.13-r1
index 8f7146b8e382..8f7146b8e382 100644
--- a/dev-libs/xplc/files/digest-xplc-0.3.13
+++ b/dev-libs/xplc/files/digest-xplc-0.3.13-r1
diff --git a/dev-libs/xplc/xplc-0.3.13.ebuild b/dev-libs/xplc/xplc-0.3.13-r1.ebuild
index c33d7732581c..f9c0bc09590e 100644
--- a/dev-libs/xplc/xplc-0.3.13.ebuild
+++ b/dev-libs/xplc/xplc-0.3.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xplc/xplc-0.3.13.ebuild,v 1.1 2005/12/24 17:06:58 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xplc/xplc-0.3.13-r1.ebuild,v 1.1 2005/12/28 09:59:26 mrness Exp $
 
 DESCRIPTION="cross platform lightweight components library for C++"
 HOMEPAGE="http://xplc.sourceforge.net"
@@ -14,6 +14,19 @@ IUSE=""
 DEPEND="virtual/libc
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+
+	#solve conflict with uuidgen utility installed by sys-fs/e2fsprogs (#116699)
+	cd "${S}"
+	sed -i -e "s/uuidgen/xplc-uuidgen/g" -e "s/uuidcdef/xplc-uuidcdef/g" \
+		uuid/{rules.mk,vars.mk} config/rules.mk \
+		uuid/bin/*.1 include/xplc/*.h && \
+			mv uuid/bin/uuidgen.1 uuid/bin/xplc-uuidgen.1 &&
+			mv uuid/bin/uuidgen.c uuid/bin/xplc-uuidgen.c ||
+			die "uuidgen rename failed"
+}
+
 src_test() {
 	make tests || die "at least one test has failed"
 }