diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-03-20 19:54:42 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-03-20 19:54:42 +0000 |
| commit | 28d3f2f8f890baad0d5cad39bc54029b61ff07a8 (patch) | |
| tree | e4dc21977108f1d76f90f7b6fb86c7280f4e4fd1 | |
| parent | x11-libs/fltk SLOTMOVE 1.1 -> 1 (diff) | |
| download | historical-28d3f2f8f890baad0d5cad39bc54029b61ff07a8.tar.gz historical-28d3f2f8f890baad0d5cad39bc54029b61ff07a8.tar.bz2 historical-28d3f2f8f890baad0d5cad39bc54029b61ff07a8.zip | |
x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
| -rw-r--r-- | x11-wm/flwm/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/flwm/Manifest | 14 | ||||
| -rw-r--r-- | x11-wm/flwm/flwm-1.02.ebuild | 16 |
3 files changed, 26 insertions, 11 deletions
diff --git a/x11-wm/flwm/ChangeLog b/x11-wm/flwm/ChangeLog index 970790b7b6cb..6db2dee908fa 100644 --- a/x11-wm/flwm/ChangeLog +++ b/x11-wm/flwm/ChangeLog @@ -1,6 +1,9 @@ # 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.15 2007/12/26 13:57:47 coldwind Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.16 2011/03/20 19:54:42 jlec Exp $ + + 20 Mar 2011; Justin Lecher <jlec@gentoo.org> flwm-1.02.ebuild: + x11-libs/fltk SLOTMOVE 1.1 -> 1, corrected ebuild accordingly 26 Dec 2007; Santiago M. Mola <coldwind@gentoo.org> -flwm-1.00-r4.ebuild: Punt old versions. diff --git a/x11-wm/flwm/Manifest b/x11-wm/flwm/Manifest index cb85ae618b36..9561a2b9684b 100644 --- a/x11-wm/flwm/Manifest +++ b/x11-wm/flwm/Manifest @@ -1,6 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX flwm-1.00-fltk1.1.patch 376 RMD160 cc1bb8210bc7ad77f4790c23ffd02d6c6f797027 SHA1 ac82d2a7148f5a8ccee1e1f76e69ab423e24c716 SHA256 37b38e1101d1e75c3dc61d03944f982b264205c2f91b99568ae2b6204c42295d AUX flwm-1.02-strip.patch 300 RMD160 b7909126bc7881ea8cce2ea6fa1cba3f4959c6b9 SHA1 09ada04486132bcecd2c1baa4a682cfeb80c2fcd SHA256 d242b8ce00a2446b23dfb91777bff61c89f559d29c51c9d39f6fffcbc64c7f41 DIST flwm-1.02.tgz 64142 RMD160 634af3b1882f1753fd82d54e09f2484c9aadad68 SHA1 bd348fa8a1c65b2318bf59e15cba0dcd511b3134 SHA256 0570681d68f7ab8873e3a85ec48caea5e456971b222e56d5d615ab46e3cb0478 -EBUILD flwm-1.02.ebuild 995 RMD160 2a781db160276101aa67dd67c0ba06de523424c4 SHA1 60c435d8a84c012ac9407911d73c5737774bd7c4 SHA256 81a05f81b1dbd0b45ef4aefd2beae5ddeff18abc82b41c39c3358c990820be57 -MISC ChangeLog 2326 RMD160 46b3d51471745f4ad5b3888e22e7ae2a82d90d02 SHA1 f30468f9f6872761cff9760b217bd750f41aa770 SHA256 2c447fb5ea8160971aed080e1bc6b9cd30fff6e88d81c3704e7333b46c7c9d5e +EBUILD flwm-1.02.ebuild 1023 RMD160 fda2d100d5bdbfee3bd63908080441e4e245614f SHA1 dfbc00aff711e8f635eb7ea027a48fe692a8c771 SHA256 07394a7469baed748af75904e70519d46171f30d1b218f111bb15bee01d02a30 +MISC ChangeLog 2452 RMD160 cd614fa3851e63cd490196c07a59534af61ffb50 SHA1 c18ddc62cb106b35d2b2f9525eabb0b7131e002d SHA256 c5f865cfdb955e9cf7334be5819ec63f2d14e30647d405f8b4a00e21ca5335ac MISC metadata.xml 330 RMD160 691836c4965dfb151d4acb71cf7efd2ded5516c9 SHA1 f4984d980c752208a7c81c09d7e200f86040f293 SHA256 c41f2433339edc3841ef1af06a7c32212549ce0c03e907dd16b0743b1e778825 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk2GW4gACgkQgAnW8HDreRZyAQCeJfKx5GSf0sXsfqItjS13E3EF +aycAoLuFdqlrxLZkOjUzI7WyeFeymMhU +=6nav +-----END PGP SIGNATURE----- diff --git a/x11-wm/flwm/flwm-1.02.ebuild b/x11-wm/flwm/flwm-1.02.ebuild index c54fa06f6db0..baf3be232fef 100644 --- a/x11-wm/flwm/flwm-1.02.ebuild +++ b/x11-wm/flwm/flwm-1.02.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2011 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 $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.02.ebuild,v 1.2 2011/03/20 19:54:42 jlec Exp $ EAPI=1 -inherit savedconfig eutils flag-o-matic multilib +inherit savedconfig eutils flag-o-matic multilib toolchain-funcs DESCRIPTION="A lightweight window manager based on fltk" -HOMEPAGE="http://flwm.sourceforge.net" +HOMEPAGE="http://flwm.sourceforge.net/" SRC_URI="http://flwm.sourceforge.net/${P}.tgz" SLOT="0" @@ -15,7 +15,8 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~x86" IUSE="opengl" -DEPEND=">=x11-libs/fltk-1.1.7-r3:1.1 +DEPEND=" + x11-libs/fltk:1 opengl? ( virtual/opengl )" RDEPEND="${DEPEND}" @@ -25,12 +26,13 @@ src_unpack() { epatch "${FILESDIR}/${P}-strip.patch" restore_config config.h + tc-export CXX } 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 + append-flags -I$(fltk-config --includedir) + append-ldflags -L$(dirname $(fltk-config --libs)) econf || die "econf failed" emake || die "emake failed" |