Fix install paths so that the library can find the files in the right location

  #50733 by Roy Culley

6 files changed, 69 insertions, 99 deletions

diff --git a/x11-libs/xclass/ChangeLog b/x11-libs/xclass/ChangeLog
index eb3ae9a5ebbd..28e10ae74fe6 100644
--- a/x11-libs/xclass/ChangeLog
+++ b/x11-libs/xclass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/xclass
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xclass/ChangeLog,v 1.8 2004/04/26 14:44:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xclass/ChangeLog,v 1.9 2004/05/14 00:21:25 vapier Exp $
+
+*xclass-0.8.2-r1 (13 May 2004)
+
+  13 May 2004; Mike Frysinger <vapier@gentoo.org> -xclass-0.7.4.ebuild,
+  +xclass-0.8.2-r1.ebuild, -xclass-0.8.2.ebuild:
+  Fix install paths so that the library can find the files in the right location
+  #50733 by Roy Culley
 
   26 Apr 2004; Aron Griffis <agriffis@gentoo.org> xclass-0.7.4.ebuild:
   Add die following econf for bug 48950
diff --git a/x11-libs/xclass/files/digest-xclass-0.7.4 b/x11-libs/xclass/files/digest-xclass-0.7.4
deleted file mode 100644
index 6d8e2ec6b975..000000000000
--- a/x11-libs/xclass/files/digest-xclass-0.7.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f66e0812fa751ee6fc9d83c68e0a4a5 xclass-0.7.4.tar.gz 523626
diff --git a/x11-libs/xclass/files/digest-xclass-0.8.2 b/x11-libs/xclass/files/digest-xclass-0.8.2-r1
index 2d6ea07a61bb..2d6ea07a61bb 100644
--- a/x11-libs/xclass/files/digest-xclass-0.8.2
+++ b/x11-libs/xclass/files/digest-xclass-0.8.2-r1
diff --git a/x11-libs/xclass/xclass-0.7.4.ebuild b/x11-libs/xclass/xclass-0.7.4.ebuild
deleted file mode 100644
index ac40fb7b19de..000000000000
--- a/x11-libs/xclass/xclass-0.7.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xclass/xclass-0.7.4.ebuild,v 1.8 2004/04/26 14:44:29 agriffis Exp $
-
-DESCRIPTION="a C++ GUI toolkit for the X windows environment"
-HOMEPAGE="http://xclass.sourceforge.net/"
-SRC_URI="ftp://mitac11.uia.ac.be/pub/xclass/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~alpha"
-
-DEPEND="virtual/x11
-	virtual/glibc"
-
-src_compile() {
-	econf --enable-shared=yes --with-x || die "econf failed"
-
-	# for some reason -fPIC dies while sandboxed ...
-	#cd ${S}/lib/libxclass
-	#cp Makefile Makefile.old
-	#sed -e "s/shared: CXXFLAGS += -fPIC//" \
-	#	Makefile.old > Makefile
-
-	cd ${S}
-	if [ "`use static`" ] ; then
-		emake		|| die "'emake' failed"
-	else
-		emake shared	|| die "'emake shared' failed"
-	fi
-}
-
-src_install() {
-	rm -rf `find . -name 'Makefile*'`
-
-	dobin config/xc-config
-
-	dodoc doc/*
-
-	dodir /usr/share/xclass
-	insinto /usr/share/xclass
-	mv "icons/Lock screen.s.xpm" ${D}/usr/share/xclass/
-	doins icons/*.xpm
-
-	dodir /usr/include/xclass
-	insinto /usr/include/xclass
-	doins include/xclass/*.h
-
-	dolib lib/libxclass/lib*
-}
diff --git a/x11-libs/xclass/xclass-0.8.2-r1.ebuild b/x11-libs/xclass/xclass-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..725d58140f43
--- /dev/null
+++ b/x11-libs/xclass/xclass-0.8.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xclass/xclass-0.8.2-r1.ebuild,v 1.1 2004/05/14 00:21:25 vapier Exp $
+
+DESCRIPTION="a C++ GUI toolkit for the X windows environment"
+HOMEPAGE="http://xclass.sourceforge.net/"
+SRC_URI="ftp://mitac11.uia.ac.be/pub/xclass/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha"
+IUSE=""
+
+DEPEND="virtual/x11
+	virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i 's:example-app::' Makefile.in
+	sed -i \
+		-e 's:/usr/local/xclass-icons:/usr/share/icons/xclass:' \
+		-e 's:/usr/local/xclass:/:' \
+		lib/libxclass/Makefile.in
+	sed -i \
+		-e 's:/usr/local/xclass/icons:/usr/share/icons/xclass:' \
+		-e 's:mime\.types:xclass.mime.types:' \
+		doc/xclassrc
+}
+
+src_compile() {
+	econf --enable-shared=yes --with-x || die
+	if use static ; then
+		emake || die "'emake' failed"
+	else
+		emake shared || die "'emake shared' failed"
+	fi
+}
+
+src_install() {
+	rm -rf `find . -name 'Makefile*'`
+
+	dobin config/xc-config || die
+
+	insinto /etc
+	doins doc/xclassrc || die
+	newins doc/mime.types xclass.mime.types || die
+
+	dodoc doc/*
+
+	dodir /usr/share/icons/xclass
+	insinto /usr/share/icons/xclass
+	mv "icons/Lock screen.s.xpm" ${D}/usr/share/icons/xclass/
+	doins icons/*.xpm || die
+
+	dodir /usr/include/xclass
+	insinto /usr/include/xclass
+	doins include/xclass/*.h || die
+
+	dolib lib/libxclass/lib* || die
+}
diff --git a/x11-libs/xclass/xclass-0.8.2.ebuild b/x11-libs/xclass/xclass-0.8.2.ebuild
deleted file mode 100644
index e5f60a6580a3..000000000000
--- a/x11-libs/xclass/xclass-0.8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xclass/xclass-0.8.2.ebuild,v 1.3 2004/04/17 23:02:17 aliz Exp $
-
-DESCRIPTION="a C++ GUI toolkit for the X windows environment"
-HOMEPAGE="http://xclass.sourceforge.net/"
-SRC_URI="ftp://mitac11.uia.ac.be/pub/xclass/${P}.tar.gz"
-IUSE=""
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="virtual/x11
-	virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	sed -i 's:example-app::' ${S}/Makefile.in
-}
-
-src_compile() {
-	econf --enable-shared=yes --with-x || die
-	if [ `use static` ] ; then
-		emake || die "'emake' failed"
-	else
-		emake shared || die "'emake shared' failed"
-	fi
-}
-
-src_install() {
-	rm -rf `find . -name 'Makefile*'`
-
-	dobin config/xc-config
-
-	dodoc doc/*
-
-	dodir /usr/share/xclass
-	insinto /usr/share/xclass
-	mv "icons/Lock screen.s.xpm" ${D}/usr/share/xclass/
-	doins icons/*.xpm
-
-	dodir /usr/include/xclass
-	insinto /usr/include/xclass
-	doins include/xclass/*.h
-
-	dolib lib/libxclass/lib*
-}