fix license for 1.8.4, bug 212672

Package-Manager: portage-2.1.5_rc2

4 files changed, 12 insertions, 79 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/Manifest b/dev-scheme/guile/Manifest
index c456457b4ccc..55f6e1f9182a 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -17,8 +17,7 @@ EBUILD guile-1.6.8.ebuild 2278 RMD160 0bd994ae6af1c0275ba74f8911f68f686b69eca3 S
 EBUILD guile-1.8.2.ebuild 2165 RMD160 56e99fb088268cecc2661f3903aa650a053d9632 SHA1 20897ad6478f7c011b90e2473d1b4e3e945c7ba2 SHA256 6e2d71b46a4f162e9ff7910b0b3dd93ff6c3298b4facf4c94bee2f37ec91d347
 EBUILD guile-1.8.3-r1.ebuild 1896 RMD160 4339a5a98770e5f9e1255e97c2d8a9e62b01e6f0 SHA1 7ee88b6446e478bf60a4f1a5687442f230207e23 SHA256 15e6f593aba273f82bf09faa11605415ea51627e9ef0253af2a76bc7854b84d2
 EBUILD guile-1.8.3-r2.ebuild 2240 RMD160 11259b8079ebcbc441edb01d39fd4e95547b41e1 SHA1 fb735afa93faaad03d686affd7ea87307edb6898 SHA256 04c75b3bbed43e66145099fbc51e073170fd4c49c509c81c46b2a4792dffb62e
-EBUILD guile-1.8.3-r25.ebuild 2167 RMD160 edd8e99196e3efd5f2654271877457766b73a617 SHA1 944d0d1513b25b1a43c79082aa14dd8aab3e6a3e SHA256 7de765d4b958a0c262445e33911eeab51c1e2ee8ebf843bca271bbde7bcf798a
 EBUILD guile-1.8.3.ebuild 1847 RMD160 3d80a6405328b3a03cf28b17438da9d854c88f09 SHA1 c114ccd7a7f9bd28e4aa7f083288b82ae655f686 SHA256 354e090b0185fd2b42814bc24ff2f712f0e1a36f1466c002f255b7b30c6e63c7
-EBUILD guile-1.8.4.ebuild 2204 RMD160 8233e8ae40a21f0b475548190e9b672aa0972a19 SHA1 abb1b137c4a0e60a659306ae2cd56c3fd048f4d7 SHA256 3e17c5c0f616857ba4287e188ae4ff78670fe2ed6ded50c37aecef7b7b01e829
-MISC ChangeLog 15793 RMD160 44885a426e779c3e81f77dd3d28d88ca9b1842ac SHA1 6243a20b7017d8a070b9de1da18f1382b7674902 SHA256 239c04e84f0d1c19da261aeddc1d0032579eec194c3899fdb0ea318472f07cd1
+EBUILD guile-1.8.4.ebuild 2207 RMD160 f50e3cfe7cae6d74aea083f98fe1d0472345d010 SHA1 acaf8edca50938bad1664ff4dc4e8675926ee501 SHA256 8a26278560ffe761f3d8c613452945ef8cb7d8daf4985ea1df8377a5b54846f1
+MISC ChangeLog 16043 RMD160 16fa93a2009be4b05e4b52b6f65387dde9fe4cf1 SHA1 ba32052dc2598da9ea6b512c6a33458a8c5b03ba SHA256 0275cd25f39569ce41224b0040d7c73420a810bded0bd0022e42ac20d8bb390a
 MISC metadata.xml 555 RMD160 fd6eaba195ffdfb9189735c30a58f1da1600ee3c SHA1 b22e226e21b88b7124ab9365a4ba91f19ecc4ee0 SHA256 d167df240a4a0ff64e824febc1ace682c334ca7005eec9399551b35069d0e99e
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 )"