Fix for libtool-2.2, bug #229055. Thanks to zimous <zimous@matfyz.cz> . Remove unrecognized configure option --with-cvs. Remove old.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 20 insertions, 44 deletions

diff --git a/x11-plugins/licq-osd/ChangeLog b/x11-plugins/licq-osd/ChangeLog
index 4193f811b9f2..ff532be59fa9 100644
--- a/x11-plugins/licq-osd/ChangeLog
+++ b/x11-plugins/licq-osd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/licq-osd
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/licq-osd/ChangeLog,v 1.5 2006/10/25 18:33:52 voxus Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/licq-osd/ChangeLog,v 1.6 2008/07/05 15:37:21 loki_val Exp $
+
+  05 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -licq-osd-1.2.7.5-r1.ebuild, licq-osd-1.3.2.2.ebuild:
+  Fix for libtool-2.2, bug #229055. Thanks to zimous <zimous@matfyz.cz> .
+  Remove unrecognized configure option --with-cvs. Remove old.
 
 *licq-osd-1.3.2.2 (25 Oct 2006)
 
diff --git a/x11-plugins/licq-osd/Manifest b/x11-plugins/licq-osd/Manifest
index 0ecc82b40a81..ab7212ca03a3 100644
--- a/x11-plugins/licq-osd/Manifest
+++ b/x11-plugins/licq-osd/Manifest
@@ -1,6 +1,4 @@
-DIST osd-1.2.7.5.tgz 311030 RMD160 f57ab09a674752f9792faa52d511a29ddb644479 SHA1 442bda47976a4d314f3419710cc617f11643e05e SHA256 df7703f0b2a1eda2143a6d56c6feccbed4471f417ed67b4fc2da6dc828130fc6
 DIST osd_1.3.2.2.tgz 308140 RMD160 e1ee924d9b8f621b9451a505d11018543a5b0528 SHA1 fbbd788b71f1176538f593061be8a6523e52359c SHA256 45aa2881189846b89acb021e78079d77cb529e420ce84bc5965e87d8db58733c
-EBUILD licq-osd-1.2.7.5-r1.ebuild 840 RMD160 3498f9c36dbbb5c4efb9d357648a9efc7f20733c SHA1 905356df74797cebdf6fbe7cf6bc437b0258509b SHA256 69931edee4dc072c1e2c92ad1864fc61f0bec7efcbefdf93d5ec75b4442ea67c
-EBUILD licq-osd-1.3.2.2.ebuild 905 RMD160 7702a93cab682347ee4f1f4a4b719f5a41e16efb SHA1 cb02979084f11fd1ca23d5ae7912482c89b6e6ed SHA256 fbaf90ecdf2bcd40a0ce86525cad3780b29de6bd9827a23789d04661c3da9b98
-MISC ChangeLog 848 RMD160 a38b62614536638a9ac12ec043f8c4a497af0d2e SHA1 14dd9f372a204e529808ad65852376b772b06b5b SHA256 fb0becd672a02bfe2cd1b02655696c1faca32ff1d432a24d38f4ac1c376d32d0
+EBUILD licq-osd-1.3.2.2.ebuild 1017 RMD160 d897a839d6e1293178e20d1b6129095bb5f33567 SHA1 ee3271d36d90c24715c74812285b53d417a8065b SHA256 b05688f316b0d5e218ccc49029493543fbd3a84c1b4d2041d04ff46bddf59abe
+MISC ChangeLog 1098 RMD160 550cd6d33978ec84297b17bdddd92cc9ba82bba6 SHA1 c70bd72cb4f5772c45e363cc871f66582bc21cb7 SHA256 6021c883127e627a6d05872fe94a4d666dd4a9e0499ae89415982fb6a3ed8a5c
 MISC metadata.xml 216 RMD160 aa6c1a4369edef4d9495c99e67cf34013614e386 SHA1 956610151e180325ae42bee51dbcefaa8c961fd6 SHA256 b9d5eb8bea543fbf88fac15c8c8112ff9853c7f41678c65c68cde0dc227b10a2
diff --git a/x11-plugins/licq-osd/licq-osd-1.2.7.5-r1.ebuild b/x11-plugins/licq-osd/licq-osd-1.2.7.5-r1.ebuild
deleted file mode 100644
index 427e5b321472..000000000000
--- a/x11-plugins/licq-osd/licq-osd-1.2.7.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/licq-osd/licq-osd-1.2.7.5-r1.ebuild,v 1.1 2005/03/15 12:51:03 voxus Exp $
-
-MY_PN="licq_osd_plugin"
-DESCRIPTION="On Screen Display for licq"
-HOMEPAGE="http://sourceforge.net/projects/licq-osd"
-SRC_URI="mirror://sourceforge/${PN}/osd-${PV}.tgz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="nls"
-DEPEND=">=net-im/licq-1.3.0_pre
-		>=x11-libs/xosd-2.2.2
-		nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/osd-${PV}
-
-src_compile() {
-	local myconf
-	use nls || myconf="--disable-nls"
-	myconf="${myconf} --with-licq-includes=/usr/include/licq"
-	myconf="${myconf} --with-cvs"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodoc README licq_osd.conf TODO AUTHORS
-}
diff --git a/x11-plugins/licq-osd/licq-osd-1.3.2.2.ebuild b/x11-plugins/licq-osd/licq-osd-1.3.2.2.ebuild
index 98624228f45a..f2753c213285 100644
--- a/x11-plugins/licq-osd/licq-osd-1.3.2.2.ebuild
+++ b/x11-plugins/licq-osd/licq-osd-1.3.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/licq-osd/licq-osd-1.3.2.2.ebuild,v 1.1 2006/10/25 18:33:52 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/licq-osd/licq-osd-1.3.2.2.ebuild,v 1.2 2008/07/05 15:37:21 loki_val Exp $
 
-inherit multilib
+inherit multilib autotools
 
 DESCRIPTION="On Screen Display for licq"
 HOMEPAGE="http://sourceforge.net/projects/licq-osd"
@@ -18,11 +18,18 @@ DEPEND=">=net-im/licq-1.3.0_pre
 
 S=${WORKDIR}/osd-${PV}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -f admin/config.guess admin/config.sub admin/ltmain.sh
+	AT_M4DIR=admin eautoreconf
+}
+
 src_compile() {
 	local myconf
 	use nls || myconf="--disable-nls"
 	myconf="${myconf} --with-licq-includes=/usr/include/licq"
-	myconf="${myconf} --with-cvs"
 
 	econf ${myconf} || die
 	emake || die