old

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

4 files changed, 14 insertions, 162 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index d44db1685a70..9dc5acd77a3c 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.194 2011/10/23 15:37:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.195 2011/10/23 15:40:58 ssuominen Exp $
+
+  23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -fltk-1.1.9-r1.ebuild,
+  -files/fltk-1.1.9-consts.patch:
+  old
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> fltk-1.1.10-r2.ebuild:
   alpha/ia64/sparc stable wrt #385195
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index b62ab8c09447..256727f2e0f3 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -6,7 +6,6 @@ AUX fltk-1.1.10-includedir.patch 1163 RMD160 f3433f4e4b229e06897ee94be105dfc6e90
 AUX fltk-1.1.10-libpng15.patch 1845 RMD160 b725decb31dcdda3e63171ba9e367e745b15fdd0 SHA1 2947322303f86d2f243eb7317f8a2eff88c36fab SHA256 3d7a055197b50c8466d2c366edc12dfa136eb2d744f8a499cd6fc7c6c0b4ad34
 AUX fltk-1.1.9-as-needed.patch 4176 RMD160 a4aa9a3e985a77b1355ef0653f603ac9ec2ab35f SHA1 b28366c4721a6406968594ff33fe72dfe5a72b18 SHA256 63168426ee87d57b7105934c2a0f4655403d6c6d0657b8448f32cfc40131b16d
 AUX fltk-1.1.9-conf-tests.patch 3086 RMD160 7fe5307dfe6b771dffdd28f87751a1529ca37ff8 SHA1 91403efd58b94bf2928a3ebed1e052f2b249f656 SHA256 24aaa8187f3218b9b6c8f16756b3167c8107a6022d312aabec666ead96e4b211
-AUX fltk-1.1.9-consts.patch 920 RMD160 efde1c9cefc08dd2829aadc536f55822f3ffd147 SHA1 d470b0a87839d6cde6ee5f0034a4cfdb6bb87d73 SHA256 366dd980d8d0bcfd0e5b1010316caf9103437976a8a10a0dd7b12943782dc082
 AUX fltk-1.1.9-desktop.patch 400 RMD160 c287cade8fe936db0334e1c364c8165512da9bd4 SHA1 44fd58b743698b97c38eea4bc1580a14d1c60916 SHA256 d1e073793cab3c5d7c88a95ae7e3e0e8e0014524bb53a1ae76f6526c41e4c191
 AUX fltk-1.1.9-glibc2.10-scandir.patch 736 RMD160 d2d28d50a5704bc64639a82ab2d7910220efd2b2 SHA1 72460b2d9e6e049b5e37fbe73930712e9ded8051 SHA256 bc7ba1695141ccd35908656e310577f10ac0a8866d8bdea6225e38970c82c7c7
 AUX fltk-1.1.9-share.patch 1892 RMD160 90f3939425ac31868a5cbbb01b66dcdb41a26e0d SHA1 12d37ac1dd6d2425b03ac964464049af3a048139 SHA256 3818c7b31ebc06e545facd409268dfb89dff8d889083b00f32fe79baafb7d56f
@@ -22,20 +21,22 @@ AUX fltk2-glibc2.10-scandir.patch 658 RMD160 119477a7733bd295c017bd320811c928a08
 AUX fltk2-ldflags.patch 2692 RMD160 97682c8e9f6c84d881edadff92349fad7ff0d52a SHA1 150096fb9e5fefbcf7bf4cc3ffd3c27ce4be1985 SHA256 d7308e596c00a5848c1fb1c8c3f606b1838ecd1a9477a1e438afb8f74d586e3a
 AUX fltk2-nogl.patch 1222 RMD160 18ae618fb0b70678bd811b0c1871bac11230515a SHA1 0e9774c5df1721e468f21a96b5861dcf632c39ff SHA256 97757338e8a8dd9e75efd7b20520696e2b1e588cddb96b710315ddc1acc50faf
 DIST fltk-1.1.10-source.tar.bz2 2214382 RMD160 f8fc4371811efcc0d6fc73edd0525d8ff87a4faa SHA1 0d2b34fede91fa78eeaefb893dd70282f73908a8 SHA256 37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a
-DIST fltk-1.1.9-source.tar.bz2 2206178 RMD160 f22e83fc9fd5e8bc10f0eea55e1a4df2ba132d91 SHA1 6f21903dc53c829ec71e8e49655eb19e624c8247 SHA256 facba5a97a20ca92b32504174474775c6b12fb67a6f646fa0de18db709c3edde
 DIST fltk-1.3.0-source.tar.gz 4111004 RMD160 dea1eb42ae1b81efa22a54198956211367e2945a SHA1 720f2804be6132ebae9909d4e74dedcc00b39d25 SHA256 990676808294cea4cca3de833ad5a5de08073c11b665356d4ecf35d22535b21c
 DIST fltk-2.0.x-r6970.tar.bz2 2529193 RMD160 5d114b5861807a15638d2b0f7ac55a909c1b6870 SHA1 0aaa688786a858b7af84e992d5438aab4ba84b0e SHA256 0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3
 EBUILD fltk-1.1.10-r2.ebuild 3942 RMD160 3830067c2398c4f7b173e5077238c28ec7a46dc2 SHA1 db75d7a264e8da18025ceeebffbc61cd381a19ae SHA256 ceba5578b659ca6eb51bbc3ed805e65d331685162060e60e1fba2d542954b6a4
-EBUILD fltk-1.1.9-r1.ebuild 3619 RMD160 2bd5e83b47f77db7c566dd2e3c353a63f74d5117 SHA1 46f3f8a20abe86a615b614f639a272b546af3c0a SHA256 8eb271dff418f167f8886fc6de4157f6d346d07de91187a5506378b95c752dfd
 EBUILD fltk-1.3.0.ebuild 3851 RMD160 62477c2590f66ec3e4b1f1b7013b0d7a45592649 SHA1 36a90ccf20ffeb5bd988b6ef61e1b6fba2ae13ff SHA256 69efd0b91729c31335876d76920c5d01ec639b4a598c85ba1e9c738ef9bda7a0
 EBUILD fltk-2.0_pre6970-r1.ebuild 2637 RMD160 e14f3709bc802d13966f24186afecc810eaaaf77 SHA1 b451d1f940093ea84c29ebded6140c63c030a3b2 SHA256 7927bd774190c2c7ac6770beb99a555615b94748fc3e84713fa07d9320f2ced8
 EBUILD fltk-2.0_pre6970.ebuild 2499 RMD160 473e33748481ede77d977856375059b48994667e SHA1 d4b27ae1b48a9573104cd62ca106ad2ff9359acb SHA256 9151a4aaf72a4d22301cd16c8cf06461410a5121939162347da14c3106c4bffd
-MISC ChangeLog 27513 RMD160 82826712f79aafddfa39b233f08fc77024a4430f SHA1 7869c252d66b6f7a3eb0f2eeb9e1839c577eacf9 SHA256 f35c9225cd240346c8cd20c1cab249fb4472f238ec07176d2a3f3797e78c3598
+MISC ChangeLog 27633 RMD160 ee695bca4ca86c82720a6adc018476dce0e896f6 SHA1 cdc74336065aeab08dd7e8347024c36bd0bf1d7b SHA256 c215efd5835df13f346b39b43cbe3b8fd957eb7cc15dcf3600f7584eb2774189
 MISC metadata.xml 657 RMD160 24969ef07785738fc34d10c79dcc854d2a895ec3 SHA1 8afd06ddc3b01090acf0333f2ac41fc4a692f504 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6kNMcACgkQuQc30/atMkAE/QCfWu6c/f3KrKqImZZ3d9Mi8M2h
-afAAoJUVVwGOPtH0Rw5NVPo2Nh5+cPFs
-=/e68
+iQEcBAEBAgAGBQJOpDVdAAoJEEdUh39IaPFNMTQH/ifUyrn8N4CNPmxjBbBTjrng
+czPZ58ybUC2jf21iqKlHWnPoINZrlYsFELQHbZgbFG/NLFww6anOQVXQBNX/gZdb
+mcRkhMOAscHOlW60Tm5btDayWwNy6hHef5cm/3mVy7u9R0rxpukMdpwtOx7dsUFu
+OkR4hSoYLMQ9yDbhidk2SFmK+lvdr7zpQsTKe/wLuw5avMSi6bUhicnGylYv4iJi
+Oy7DiNWFaQk81qQPB1Z7ivbQ9p01ii5qVH3374+wrCraLl0HjMKf9Kqvc1lmm+8o
+R76fHlvPZOf61hpM/F/FGHrx+6EroqU3qFv7Prdid2t8PWJrdudercNkaaBhNSA=
+=QB+N
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/files/fltk-1.1.9-consts.patch b/x11-libs/fltk/files/fltk-1.1.9-consts.patch
deleted file mode 100644
index 1ca0d84c9fc4..000000000000
--- a/x11-libs/fltk/files/fltk-1.1.9-consts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx fltk-1.1.9/src/fl_set_fonts_xft.cxx
---- fltk-1.1.9.orig/src/fl_set_fonts_xft.cxx	2009-03-04 10:58:49.000000000 +0000
-+++ fltk-1.1.9/src/fl_set_fonts_xft.cxx	2009-03-04 11:01:25.000000000 +0000
-@@ -253,13 +253,13 @@
-       // So the bit we want is up to the first comma - BUT some strings have
-       // more than one name, separated by, guess what?, a comma...
-       stop = start = first = 0;
--      stop = strchr((const char *)font, ',');
--      start = strchr((const char *)font, ':');
-+      stop = strchr((char *)font, ',');
-+      start = strchr((char *)font, ':');
-       if ((stop) && (start) && (stop < start))
-       {
-         first = stop + 1; // discard first version of name
-         // find first comma *after* the end of the name
--        stop = strchr((const char *)start, ',');
-+        stop = strchr((char *)start, ',');
-       }
-       else
-       {
diff --git a/x11-libs/fltk/fltk-1.1.9-r1.ebuild b/x11-libs/fltk/fltk-1.1.9-r1.ebuild
deleted file mode 100644
index faa26c2a0568..000000000000
--- a/x11-libs/fltk/fltk-1.1.9-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.9-r1.ebuild,v 1.19 2011/05/01 17:14:33 armin76 Exp $
-
-EAPI=2
-inherit eutils autotools versionator fdo-mime
-
-DESCRIPTION="C++ user interface toolkit for X and OpenGL"
-HOMEPAGE="http://www.fltk.org/"
-SRC_URI="mirror://easysw/${PN}/${PV}/${P}-source.tar.bz2"
-
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-LICENSE="FLTK LGPL-2"
-
-SLOT="1"
-
-IUSE="doc examples games opengl threads xft xinerama"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXt
-	virtual/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	xinerama? ( x11-libs/libXinerama )
-	xft? ( x11-libs/libXft )
-	>=sys-libs/glibc-2.10"   # glibc-2.10 patch breaks with 2.9, bug 276695
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	doc? ( app-text/htmldoc )
-	xinerama? ( x11-proto/xineramaproto )"
-
-INCDIR=/usr/include/fltk-${SLOT}
-LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
-
-src_prepare() {
-	#epatch "${FILESDIR}"/${P}-fromdebian.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	# prevent to run twice configure (needs eautoconf), to compile tests,
-	# remove forced -Os compile
-	epatch "${FILESDIR}"/${P}-conf-tests.patch
-	# fix stricter c++ handling in glibc-2.10/gcc-4.4 (bug 270487)
-	epatch "${FILESDIR}"/${P}-glibc2.10-scandir.patch
-	epatch "${FILESDIR}"/${P}-consts.patch
-	# remove forced flags from fltk-config
-	sed -i \
-		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
-		-e '/^LDFLAGS=/d' \
-		"${S}/fltk-config.in" || die
-	# some fixes introduced because slotting
-	sed -i \
-		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
-		src/Makefile || die
-	# docs in proper docdir
-	sed -i \
-		-e "/^docdir/s:fltk:${PF}/html:" \
-		makeinclude.in || die
-	sed -e "s/7/$(get_version_component_range 3)/" \
-		"${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--includedir=${INCDIR}\
-		--libdir=${LIBDIR} \
-		--docdir=/usr/share/doc/${PF}/html \
-		--enable-largefile \
-		--enable-shared \
-		--enable-xdbe \
-		$(use_enable opengl gl) \
-		$(use_enable threads) \
-		$(use_enable xft) \
-		$(use_enable xinerama)
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		cd "${S}"/documentation
-		emake alldocs || die "emake doc failed"
-	fi
-	if use games; then
-		cd "${S}"/test
-		emake blocks checkers sudoku || die "emake games failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	emake -C fluid \
-			DESTDIR="${D}" install-linux || die "emake install fluid failed"
-	if use doc; then
-		emake -C documentation \
-			DESTDIR="${D}" install || die "emake install doc failed"
-	fi
-	local apps="fluid"
-	if use games; then
-		emake -C test \
-			DESTDIR="${D}" install-linux || die "emake install games failed"
-		emake -C documentation \
-			DESTDIR="${D}" install-linux || die "emake install doc games failed"
-		apps="${apps} sudoku blocks checkers"
-	fi
-	for app in ${apps}; do
-		dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
-			/usr/share/pixmaps/${app}.png
-	done
-	dodoc CHANGES README CREDITS ANNOUNCEMENT
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{h,cxx,fl} test/demo.menu
-	fi
-
-	insinto /usr/share/cmake/Modules
-	doins CMake/FLTK*.cmake
-
-	echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
-	echo "FLTK_DOCDIR=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
-	doenvd 99fltk-${SLOT}
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}