QA fixes, removed unneeded version.

Package-Manager: portage-2.1.4_rc7

6 files changed, 24 insertions, 133 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 96d711b655c2..7c1dbc50e314 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.93 2007/12/06 08:52:27 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.94 2007/12/06 08:55:41 nelchael Exp $
+
+  06 Dec 2007; Krzysiek Pawlik <nelchael@gentoo.org> fltk-1.1.7.ebuild,
+  -fltk-1.1.7-r1.ebuild, fltk-1.1.7-r2.ebuild:
+  QA fixes, removed unneeded version.
 
   06 Dec 2007; Krzysiek Pawlik <nelchael@gentoo.org> fltk-1.1.7-r2.ebuild:
   Remove LDFLAGS from fltk-config, see bug #199537.
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index bb40014691d6..2e804a4c6a1e 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -26,22 +26,18 @@ MD5 29c93504c8cba00eee5622ecbf61f134 files/libs-1.7.diff 960
 RMD160 3874beff965b46c4a60e99ba5bb90c563b3501f7 files/libs-1.7.diff 960
 SHA256 bd95ae19749cdeb04701ff91cc97e5c6c4b7bad5c9d07a80af02d98f01d88330 files/libs-1.7.diff 960
 DIST fltk-1.1.7-source.tar.bz2 2060757 RMD160 a539a1c6bb3363e54bc82c7995037c5d8ede9dd7 SHA1 16b174522920403af1e4ccddd36daaefda3765c8 SHA256 855a97e35da823f205253b865758715872cd2c7720e4dcf134a3b6dc18bfb96a
-EBUILD fltk-1.1.7-r1.ebuild 2683 RMD160 97783baa6a545403f69048e2800abf31d082e335 SHA1 0bdb9153d0eaac91e3bc8fbaba2227d9bb860528 SHA256 70662e43bc42befcf68260cd8fcd6895ed0e7ce23025d4c1fe502d04943091ac
-MD5 58178a1908878637e79eae1db7da4ebe fltk-1.1.7-r1.ebuild 2683
-RMD160 97783baa6a545403f69048e2800abf31d082e335 fltk-1.1.7-r1.ebuild 2683
-SHA256 70662e43bc42befcf68260cd8fcd6895ed0e7ce23025d4c1fe502d04943091ac fltk-1.1.7-r1.ebuild 2683
-EBUILD fltk-1.1.7-r2.ebuild 2891 RMD160 7c19190b09f1c26f858d60b0252fa928fdb12738 SHA1 045be8d5af93c2ede011000a7acbd205d9635b7f SHA256 aee9e2f96222dcab151c66a060c396b18d34087aa291fa6cd7f2415fcfd71c05
-MD5 9595faafd8d1e18d593b24e493c343fc fltk-1.1.7-r2.ebuild 2891
-RMD160 7c19190b09f1c26f858d60b0252fa928fdb12738 fltk-1.1.7-r2.ebuild 2891
-SHA256 aee9e2f96222dcab151c66a060c396b18d34087aa291fa6cd7f2415fcfd71c05 fltk-1.1.7-r2.ebuild 2891
-EBUILD fltk-1.1.7.ebuild 2577 RMD160 10860c6f69b548533d8120d8b8a458e96b5c4b28 SHA1 8f756cea3604efc635b7ea635e92d510659d2e28 SHA256 31b5f47a516d5255e9fc91ddc1a45ce5915882bf6f8829497650031a2412566a
-MD5 fa51bbc0fb39651b2605a29993ec919f fltk-1.1.7.ebuild 2577
-RMD160 10860c6f69b548533d8120d8b8a458e96b5c4b28 fltk-1.1.7.ebuild 2577
-SHA256 31b5f47a516d5255e9fc91ddc1a45ce5915882bf6f8829497650031a2412566a fltk-1.1.7.ebuild 2577
-MISC ChangeLog 12408 RMD160 3d2d8e595d97583b58676cc401752d19dcc89c9b SHA1 f9355bf3baa7e38afcc02bc79b09cd6e728bd2b1 SHA256 ed2e7998d19df7ded5591861f42c4ff57999ccb9fd15973318282a553dacf0d1
-MD5 da382bfeff47f2266f50187b44a6b78b ChangeLog 12408
-RMD160 3d2d8e595d97583b58676cc401752d19dcc89c9b ChangeLog 12408
-SHA256 ed2e7998d19df7ded5591861f42c4ff57999ccb9fd15973318282a553dacf0d1 ChangeLog 12408
+EBUILD fltk-1.1.7-r2.ebuild 2890 RMD160 7d5c1d2fce93eed2d48d06e640dacc3a4a0fa647 SHA1 f4df4cd0142451be646d4845b02151d005c9197b SHA256 9e9e5674fc2a6969aa4a8a9a57660417cf235576f662561d9c809d370591daea
+MD5 0dd3fa92416e7dc4cea5296e8c3c08b1 fltk-1.1.7-r2.ebuild 2890
+RMD160 7d5c1d2fce93eed2d48d06e640dacc3a4a0fa647 fltk-1.1.7-r2.ebuild 2890
+SHA256 9e9e5674fc2a6969aa4a8a9a57660417cf235576f662561d9c809d370591daea fltk-1.1.7-r2.ebuild 2890
+EBUILD fltk-1.1.7.ebuild 2579 RMD160 f561932ed46dd190000ef36f1047ca5d0c4b69c4 SHA1 a5b97ba3f582def4a185dbdfcdb0b4748ebafcbf SHA256 ab83703411a4a50574de3c0c410f88b6abf1ba4f0bff1dae8bc05e24586e177e
+MD5 b4e1d27d090acbbc989bb4f80ed9ac7b fltk-1.1.7.ebuild 2579
+RMD160 f561932ed46dd190000ef36f1047ca5d0c4b69c4 fltk-1.1.7.ebuild 2579
+SHA256 ab83703411a4a50574de3c0c410f88b6abf1ba4f0bff1dae8bc05e24586e177e fltk-1.1.7.ebuild 2579
+MISC ChangeLog 12566 RMD160 d4d10e3b5e23f96ff86a8015fbd808b458988eec SHA1 8a628f3310e03d120b54086e913bf70157374188 SHA256 2864a80fbd4baa7bcc33791fbcbb4866cbb312456960f07a595fa7eb1366c39b
+MD5 1822e1c048dea7605ef41f0a2b94672f ChangeLog 12566
+RMD160 d4d10e3b5e23f96ff86a8015fbd808b458988eec ChangeLog 12566
+SHA256 2864a80fbd4baa7bcc33791fbcbb4866cbb312456960f07a595fa7eb1366c39b ChangeLog 12566
 MISC metadata.xml 314 RMD160 24115a7758bbd2c07da47a2ffe4b79bc31cefa59 SHA1 1a4ff85c48bc39f8fac4fafc8ae06c34a290bab2 SHA256 91972db8a2f941249874f23c38338b0c7aa06cc29802074571a3582fb5269516
 MD5 aeb16984ffc07732d37c5974c14f28de metadata.xml 314
 RMD160 24115a7758bbd2c07da47a2ffe4b79bc31cefa59 metadata.xml 314
@@ -49,16 +45,13 @@ SHA256 91972db8a2f941249874f23c38338b0c7aa06cc29802074571a3582fb5269516 metadata
 MD5 b91980ec72860ef3acc1a9256d24aa96 files/digest-fltk-1.1.7 259
 RMD160 d7c0cd6b9f600e0c120baae3f417368b27eb7e09 files/digest-fltk-1.1.7 259
 SHA256 613c60277ccfb5adef1c1a6e37c073066872fcf368b663f2ee04193ee1821276 files/digest-fltk-1.1.7 259
-MD5 b91980ec72860ef3acc1a9256d24aa96 files/digest-fltk-1.1.7-r1 259
-RMD160 d7c0cd6b9f600e0c120baae3f417368b27eb7e09 files/digest-fltk-1.1.7-r1 259
-SHA256 613c60277ccfb5adef1c1a6e37c073066872fcf368b663f2ee04193ee1821276 files/digest-fltk-1.1.7-r1 259
 MD5 b91980ec72860ef3acc1a9256d24aa96 files/digest-fltk-1.1.7-r2 259
 RMD160 d7c0cd6b9f600e0c120baae3f417368b27eb7e09 files/digest-fltk-1.1.7-r2 259
 SHA256 613c60277ccfb5adef1c1a6e37c073066872fcf368b663f2ee04193ee1821276 files/digest-fltk-1.1.7-r2 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHV7hRgo/w9rxVVVERApYhAKCrRiQKCBvGRyHGyKU/Fd54/M5qkACfV8uR
-0yR03nR2GZ1enYffsVY85xc=
-=5UhT
+iD8DBQFHV7kSgo/w9rxVVVERAogUAKCCqTmuxEupJtRXXOjVnAVsW1TWXwCeI1yN
+kMteMx6YAcXdfyDQ4JWgY5U=
+=wJyG
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/files/digest-fltk-1.1.7-r1 b/x11-libs/fltk/files/digest-fltk-1.1.7-r1
deleted file mode 100644
index f20ba91db664..000000000000
--- a/x11-libs/fltk/files/digest-fltk-1.1.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2e29319119adc9d63b2f26b72cae0a88 fltk-1.1.7-source.tar.bz2 2060757
-RMD160 a539a1c6bb3363e54bc82c7995037c5d8ede9dd7 fltk-1.1.7-source.tar.bz2 2060757
-SHA256 855a97e35da823f205253b865758715872cd2c7720e4dcf134a3b6dc18bfb96a fltk-1.1.7-source.tar.bz2 2060757
diff --git a/x11-libs/fltk/fltk-1.1.7-r1.ebuild b/x11-libs/fltk/fltk-1.1.7-r1.ebuild
deleted file mode 100644
index 9d284b41aedb..000000000000
--- a/x11-libs/fltk/fltk-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7-r1.ebuild,v 1.5 2007/08/22 09:25:10 coldwind Exp $
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL."
-HOMEPAGE="http://www.fltk.org"
-SRC_URI="http://ftp.easysw.com/pub/${PN}/${PV}/${P}-source.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-LICENSE="FLTK LGPL-2"
-
-PV_MAJOR=${PV/.*/}
-PV_MINOR=${PV#${PV_MAJOR}.}
-PV_MINOR=${PV_MINOR/.*}
-SLOT="${PV_MAJOR}.${PV_MINOR}"
-
-INCDIR=/usr/include/fltk-${SLOT}
-LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
-
-IUSE="noxft opengl debug"
-
-DEPEND="
-	x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXt
-	x11-proto/xextproto
-	!noxft? ( virtual/xft )
-	media-libs/libpng
-	media-libs/jpeg
-	opengl? ( virtual/opengl )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/libs-1.7.diff" || die "patch failed"
-	use amd64 && {
-		epatch "${FILESDIR}/${P}-amd64.patch" || die "patch failed"
-	}
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	epatch "${FILESDIR}/${P}-dieonerrors.patch"
-}
-
-src_compile() {
-	local myconf
-	myconf="--enable-shared --enable-xdbe --enable-static --enable-threads"
-
-	if ! use noxft; then
-		myconf="${myconf} --enable-xft"
-	else
-		myconf="${myconf} --disable-xft"
-	fi
-
-	use debug && myconf="${myconf} --enable-debug"
-
-	use opengl || myconf="${myconf} --disable-gl"
-
-	# needed for glibc-2.3.1 (as far as i can test)
-	# otherwise libstdc++ won't be linked. #17894 and #15572
-	# doesn't happen for glibc-2.3.2 - <liquidx@gentoo.org>
-	export CXX=$(tc-getCXX)
-	export CC=$(tc-getCC)
-
-	# bug #19894
-	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
-	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
-	econf \
-		--includedir=${INCDIR}\
-		--libdir=${LIBDIR} \
-		${myconf} || die "Configuration Failed"
-
-	emake || die "Parallel Make Failed"
-}
-
-src_install() {
-	einstall \
-		includedir="${D}${INCDIR}" \
-		libdir="${D}${LIBDIR}" || die "Installation Failed"
-
-	ranlib "${D}${LIBDIR}"/*.a
-
-	insinto /usr/share/cmake/Modules
-	doins "${FILESDIR}"/FLTKConfig.cmake CMake/FLTKUse.cmake
-
-	dodoc CHANGES README
-
-	echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
-	echo "FLTK_DOCDIR=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
-
-	doenvd 99fltk-${SLOT}
-
-	dohtml -A xbm,xpm,h,cxx,fl,menu -r "${D}"/usr/share/doc/fltk/*
-	rm -rf "${D}"/usr/share/doc/fltk
-	rm -rf "${D}"/usr/share/man/cat{1,3}
-}
-
-pkg_postinst() {
-	ewarn "the xft USE flag has been changed to noxft. this was because most"
-	ewarn "users want xft, but if you do not, be sure to change the flag"
-}
diff --git a/x11-libs/fltk/fltk-1.1.7-r2.ebuild b/x11-libs/fltk/fltk-1.1.7-r2.ebuild
index 5e5158af66e1..662870b1e643 100644
--- a/x11-libs/fltk/fltk-1.1.7-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.1.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7-r2.ebuild,v 1.16 2007/12/06 08:52:27 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7-r2.ebuild,v 1.17 2007/12/06 08:55:41 nelchael Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -97,7 +97,7 @@ src_install() {
 	dohtml -A xbm,xpm,h,cxx,fl,menu -r "${D}"/usr/share/doc/fltk/*
 	rm -rf "${D}"/usr/share/doc/fltk
 	rm -rf "${D}"/usr/share/man/cat{1,3}
-	
+
 	sed -i -e 's,^LDFLAGS=.*$,LDFLAGS="",g' "${D}/usr/bin/fltk-config" || \
 		die "sed of fltk-config failed"
 
diff --git a/x11-libs/fltk/fltk-1.1.7.ebuild b/x11-libs/fltk/fltk-1.1.7.ebuild
index e79869f41c9f..6f91e6430427 100644
--- a/x11-libs/fltk/fltk-1.1.7.ebuild
+++ b/x11-libs/fltk/fltk-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.17 2007/08/22 09:25:10 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.18 2007/12/06 08:55:41 nelchael Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -33,7 +33,7 @@ DEPEND="x11-libs/libXext
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	epatch "${FILESDIR}/libs-1.7.diff" || die "patch failed"
 	use amd64 && {
 		epatch "${FILESDIR}/${P}-amd64.patch" || die "patch failed"