fix license for 1.8.4, bug 212672

(Portage version: 2.1.5_rc2)

3 files changed, 10 insertions, 76 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index 7c398cd2e191..cd24a58576d4 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-scheme/guile
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.50 2008/02/24 19:46:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.51 2008/04/13 10:43:49 hkbst Exp $
+
+  13 Apr 2008; Marijn Schouten <hkBst@gentoo.org> -guile-1.8.3-r25.ebuild,
+  guile-1.8.4.ebuild:
+  fix license for 1.8.4, bug 212672
+
+  13 Apr 2008; Marijn Schouten <hkBst@gentoo.org> -guile-1.8.3-r25.ebuild:
+  remove experimental prefix=/ ebuild
 
   24 Feb 2008; Jeroen Roovers <jer@gentoo.org> guile-1.8.3-r2.ebuild:
   Stable for HPPA (bug #210465).
diff --git a/dev-scheme/guile/guile-1.8.3-r25.ebuild b/dev-scheme/guile/guile-1.8.3-r25.ebuild
deleted file mode 100644
index 8eee5963fe41..000000000000
--- a/dev-scheme/guile/guile-1.8.3-r25.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.3-r25.ebuild,v 1.3 2008/02/17 16:40:09 opfer Exp $
-
-inherit eutils autotools flag-o-matic multilib
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-RESTRICT="!regex? ( test )"
-
-DEPEND=">=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-IUSE="networking regex discouraged deprecated elisp nls debug-freelist debug-malloc debug threads"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	epatch "${FILESDIR}"/fix-reader-cr.diff
-
-	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
-}
-
-src_compile() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-#	einstall || die "install failed"
-
-	dodir /$(get_libdir)
-	for file in "${D}"/usr/$(get_libdir)/*.so*; do
-		mv "${file}" "${D}"/$(get_libdir)/
-		dosym $(get_libdir)/"$(basename $file)" /usr/$(get_libdir)/"$(basename $file)"
-	done
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README SNAPSHOTS THANKS
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
-}
diff --git a/dev-scheme/guile/guile-1.8.4.ebuild b/dev-scheme/guile/guile-1.8.4.ebuild
index 03e8d4cca4e3..7916b0323e79 100644
--- a/dev-scheme/guile/guile-1.8.4.ebuild
+++ b/dev-scheme/guile/guile-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.4.ebuild,v 1.2 2008/02/21 13:02:57 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.4.ebuild,v 1.3 2008/04/13 10:43:49 hkbst Exp $
 
 inherit eutils autotools flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="Scheme interpreter"
 HOMEPAGE="http://www.gnu.org/software/guile/"
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 RESTRICT="!regex? ( test )"