Bump to 1.02, use savedconfig.eclass. Use EAPI=1 and update fltk dep, fixes #99993.

Package-Manager: portage-2.1.3.19

5 files changed, 83 insertions, 5 deletions

diff --git a/x11-wm/flwm/ChangeLog b/x11-wm/flwm/ChangeLog
index 9a578fcf16cc..98feaa2a4d5e 100644
--- a/x11-wm/flwm/ChangeLog
+++ b/x11-wm/flwm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/flwm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.13 2007/07/13 18:37:55 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.14 2007/12/15 21:15:37 coldwind Exp $
+
+*flwm-1.02 (15 Dec 2007)
+
+  15 Dec 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/flwm-1.02-strip.patch, +flwm-1.02.ebuild:
+  Bump to 1.02, use savedconfig.eclass. Use EAPI=1 and update fltk dep,
+  fixes #99993.
 
   13 Jul 2007; Santiago M. Mola <coldwind@gentoo.org>
   +files/flwm-1.00-fltk1.1.patch, -files/fltk1.1.patch, flwm-1.00-r4.ebuild:
diff --git a/x11-wm/flwm/Manifest b/x11-wm/flwm/Manifest
index 5be21da13e5c..71c1beef38ed 100644
--- a/x11-wm/flwm/Manifest
+++ b/x11-wm/flwm/Manifest
@@ -2,15 +2,24 @@ AUX flwm-1.00-fltk1.1.patch 376 RMD160 cc1bb8210bc7ad77f4790c23ffd02d6c6f797027
 MD5 153d0f044aec18fbaa1ea5a6ca417551 files/flwm-1.00-fltk1.1.patch 376
 RMD160 cc1bb8210bc7ad77f4790c23ffd02d6c6f797027 files/flwm-1.00-fltk1.1.patch 376
 SHA256 37b38e1101d1e75c3dc61d03944f982b264205c2f91b99568ae2b6204c42295d files/flwm-1.00-fltk1.1.patch 376
+AUX flwm-1.02-strip.patch 300 RMD160 b7909126bc7881ea8cce2ea6fa1cba3f4959c6b9 SHA1 09ada04486132bcecd2c1baa4a682cfeb80c2fcd SHA256 d242b8ce00a2446b23dfb91777bff61c89f559d29c51c9d39f6fffcbc64c7f41
+MD5 759ff3051359bce8265bb203a94b3655 files/flwm-1.02-strip.patch 300
+RMD160 b7909126bc7881ea8cce2ea6fa1cba3f4959c6b9 files/flwm-1.02-strip.patch 300
+SHA256 d242b8ce00a2446b23dfb91777bff61c89f559d29c51c9d39f6fffcbc64c7f41 files/flwm-1.02-strip.patch 300
 DIST flwm-1.00.tgz 61747 RMD160 a5d8eb5d55b2aef5206147ecf3c7090afe924dc0 SHA1 2dfe5be6b27832d9120acc3b8ced8e422834d329 SHA256 f4df1a0a5699fead28d4737253b40fb999d1d610d48d4f1af46b51af84a94084
+DIST flwm-1.02.tgz 64142 RMD160 634af3b1882f1753fd82d54e09f2484c9aadad68 SHA1 bd348fa8a1c65b2318bf59e15cba0dcd511b3134 SHA256 0570681d68f7ab8873e3a85ec48caea5e456971b222e56d5d615ab46e3cb0478
 EBUILD flwm-1.00-r4.ebuild 1966 RMD160 7d493489a435bc5b62a8eae10e0ede97342719d7 SHA1 9b56bb9fe04ad6072dbf3a5fc11cbcd14dbb4db3 SHA256 02eaa6f2f51186c0103a1b0ba3ef8e0ce95472a59ce4ebc182a24df11a4fe3ae
 MD5 cfb02eabc7c96f8056447ca1b00176c9 flwm-1.00-r4.ebuild 1966
 RMD160 7d493489a435bc5b62a8eae10e0ede97342719d7 flwm-1.00-r4.ebuild 1966
 SHA256 02eaa6f2f51186c0103a1b0ba3ef8e0ce95472a59ce4ebc182a24df11a4fe3ae flwm-1.00-r4.ebuild 1966
-MISC ChangeLog 2008 RMD160 42ee73055b2e438abe6a8567f0e49c15f25b1f43 SHA1 877eb18e1dd666ec578f567101c620250435c627 SHA256 68ee9ac96ca743474b2caa7c701b444ad79e1808e36eef16126f582f10cd8c4e
-MD5 fec0d6534a7d1ae3abd8cdae5b673010 ChangeLog 2008
-RMD160 42ee73055b2e438abe6a8567f0e49c15f25b1f43 ChangeLog 2008
-SHA256 68ee9ac96ca743474b2caa7c701b444ad79e1808e36eef16126f582f10cd8c4e ChangeLog 2008
+EBUILD flwm-1.02.ebuild 995 RMD160 2a781db160276101aa67dd67c0ba06de523424c4 SHA1 60c435d8a84c012ac9407911d73c5737774bd7c4 SHA256 81a05f81b1dbd0b45ef4aefd2beae5ddeff18abc82b41c39c3358c990820be57
+MD5 f9d2b674760d29188fe0cdf4e6131bbf flwm-1.02.ebuild 995
+RMD160 2a781db160276101aa67dd67c0ba06de523424c4 flwm-1.02.ebuild 995
+SHA256 81a05f81b1dbd0b45ef4aefd2beae5ddeff18abc82b41c39c3358c990820be57 flwm-1.02.ebuild 995
+MISC ChangeLog 2228 RMD160 201c54e0d4e8cc0882d941f0dcd24589d23f5a61 SHA1 36846b0de49be5d0cdd9e5c6e790510944a56afd SHA256 776380ad5c5feef1c9ad582b23b56c235b83fd2675c2987d299d593b5d4fdb02
+MD5 9ca430bb884dca6d8708c73680470e89 ChangeLog 2228
+RMD160 201c54e0d4e8cc0882d941f0dcd24589d23f5a61 ChangeLog 2228
+SHA256 776380ad5c5feef1c9ad582b23b56c235b83fd2675c2987d299d593b5d4fdb02 ChangeLog 2228
 MISC metadata.xml 330 RMD160 691836c4965dfb151d4acb71cf7efd2ded5516c9 SHA1 f4984d980c752208a7c81c09d7e200f86040f293 SHA256 c41f2433339edc3841ef1af06a7c32212549ce0c03e907dd16b0743b1e778825
 MD5 70b93a47cb23b5eec6774b7dbc9ad702 metadata.xml 330
 RMD160 691836c4965dfb151d4acb71cf7efd2ded5516c9 metadata.xml 330
@@ -18,3 +27,6 @@ SHA256 c41f2433339edc3841ef1af06a7c32212549ce0c03e907dd16b0743b1e778825 metadata
 MD5 8595748534e24013d0ef4d715fea578a files/digest-flwm-1.00-r4 217
 RMD160 1a4bc4039d4790706d87505d3b8b97a50f629a62 files/digest-flwm-1.00-r4 217
 SHA256 7d47667151d85d446cda81eb4f423c9235e50a88b509340143a09fa82f33b1f6 files/digest-flwm-1.00-r4 217
+MD5 3470eebebbaaded1b17e84fd24507820 files/digest-flwm-1.02 217
+RMD160 f0c1990ac7ccb35aae45793a9c7f1f5a9e7d3009 files/digest-flwm-1.02 217
+SHA256 80943e6c53db858c424f4f5bc696ea38fdc13864f7d2188166ee63ee950b2e70 files/digest-flwm-1.02 217
diff --git a/x11-wm/flwm/files/digest-flwm-1.02 b/x11-wm/flwm/files/digest-flwm-1.02
new file mode 100644
index 000000000000..e7793e37b5a5
--- /dev/null
+++ b/x11-wm/flwm/files/digest-flwm-1.02
@@ -0,0 +1,3 @@
+MD5 33e1738441c351153a9c0a83a051bf7c flwm-1.02.tgz 64142
+RMD160 634af3b1882f1753fd82d54e09f2484c9aadad68 flwm-1.02.tgz 64142
+SHA256 0570681d68f7ab8873e3a85ec48caea5e456971b222e56d5d615ab46e3cb0478 flwm-1.02.tgz 64142
diff --git a/x11-wm/flwm/files/flwm-1.02-strip.patch b/x11-wm/flwm/files/flwm-1.02-strip.patch
new file mode 100644
index 000000000000..fb0e0dee5d16
--- /dev/null
+++ b/x11-wm/flwm/files/flwm-1.02-strip.patch
@@ -0,0 +1,11 @@
+--- flwm-1.02.orig/Makefile
++++ flwm-1.02/Makefile
+@@ -44,7 +44,7 @@
+ include makedepend
+ 
+ install: $(PROGRAM)
+-	$(INSTALL) -s $(PROGRAM) $(bindir)/$(PROGRAM)
++	$(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM)
+ 	$(INSTALL) $(PROGRAM).$(MANPAGE) $(mandir)/man$(MANPAGE)/$(PROGRAM).$(MANPAGE)
+ 
+ uninstall:
diff --git a/x11-wm/flwm/flwm-1.02.ebuild b/x11-wm/flwm/flwm-1.02.ebuild
new file mode 100644
index 000000000000..c54fa06f6db0
--- /dev/null
+++ b/x11-wm/flwm/flwm-1.02.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.02.ebuild,v 1.1 2007/12/15 21:15:38 coldwind Exp $
+
+EAPI=1
+
+inherit savedconfig eutils flag-o-matic multilib
+
+DESCRIPTION="A lightweight window manager based on fltk"
+HOMEPAGE="http://flwm.sourceforge.net"
+SRC_URI="http://flwm.sourceforge.net/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="opengl"
+
+DEPEND=">=x11-libs/fltk-1.1.7-r3:1.1
+	opengl? ( virtual/opengl )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-strip.patch"
+
+	restore_config config.h
+}
+
+src_compile() {
+	use opengl && export X_EXTRA_LIBS=-lGL
+	append-flags -I/usr/include/fltk-1.1
+	append-ldflags -L/usr/$(get_libdir)/fltk-1.1
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	doman flwm.1 || die
+	dodoc README flwm_wmconfig || die
+	dobin flwm || die
+
+	save_config config.h
+}