fix USE=static usage and lib install

diff --git a/x11-libs/xclass/Manifest b/x11-libs/xclass/Manifest
index 148d62d13f327ac38e309ff046adb49949f66d1b..8fa6196e4c0943e0161cfeff64a311f5c0b39910 100644 (file)
--- a/x11-libs/xclass/Manifest
+++ b/x11-libs/xclass/Manifest
@@ -1,3 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f7bc98f286b6b00d1123cdc88016e4b8 ChangeLog 1201
-MD5 e9d818f55f974733aef6b476e6d8d2e0 xclass-0.8.2-r1.ebuild 1481
+MD5 091e3a9c87b87a1b1c1698eb16c37ba1 xclass-0.8.2-r1.ebuild 1427
 MD5 5e06d8892b0af94c7e720a4c2873bc78 files/digest-xclass-0.8.2-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB1w6droRuSHgZdywRAredAJ42ZqiMWfKY5x/T8TA4jS/4iAHtPwCfcetn
+M8i7uofXDbaSsd1lMn2jSgM=
+=/RBe
+-----END PGP SIGNATURE-----

diff --git a/x11-libs/xclass/xclass-0.8.2-r1.ebuild b/x11-libs/xclass/xclass-0.8.2-r1.ebuild
index 6c1a79dfc7c393e201132a23397a31be42171e8c..7fcf3d02076eb0453816ee55e528180cda2ba375 100644 (file)
--- a/x11-libs/xclass/xclass-0.8.2-r1.ebuild
+++ b/x11-libs/xclass/xclass-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.4 2004/06/28 19:45:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xclass/xclass-0.8.2-r1.ebuild,v 1.5 2005/01/01 20:56:43 vapier Exp $
 
 DESCRIPTION="a C++ GUI toolkit for the X windows environment"
 HOMEPAGE="http://xclass.sourceforge.net/"
@@ -9,7 +9,7 @@ SRC_URI="ftp://mitac11.uia.ac.be/pub/xclass/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
-IUSE="static"
+IUSE=""
 
 DEPEND="virtual/x11
        virtual/libc
@@ -31,32 +31,28 @@ src_unpack() {
 
 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
+       emake || die "'emake' failed"
 }
 
 src_install() {
        rm -rf `find . -name 'Makefile*'`
 
-       dobin config/xc-config || die
+       dobin config/xc-config || die "xc-config failed"
 
        insinto /etc
-       doins doc/xclassrc || die
+       doins doc/xclassrc || die "xclassrc failed"
        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
+       doins icons/*.xpm || die "icons failed"
 
        dodir /usr/include/xclass
        insinto /usr/include/xclass
-       doins include/xclass/*.h || die
+       doins include/xclass/*.h || die "include failed"
 
-       dolib lib/libxclass/lib* || die
+       cd lib/libxclass
+       dolib libxclass* || die "lib failed"
 }