summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2004-08-24 10:25:16 +0000
committerMamoru Komachi <usata@gentoo.org>2004-08-24 10:25:16 +0000
commita669b7047ab55585e54e65e0703aea47db13b3b8 (patch)
tree23609325ef1200870b11bd56bbab796121f05373 /x11-wm/flwm
parentmark stable mark stable on x86 (diff)
downloadhistorical-a669b7047ab55585e54e65e0703aea47db13b3b8.tar.gz
historical-a669b7047ab55585e54e65e0703aea47db13b3b8.tar.bz2
historical-a669b7047ab55585e54e65e0703aea47db13b3b8.zip
Changed x11-base/xfree to virtual/x11; bug #60787. Integrated into one ebuild.
Diffstat (limited to 'x11-wm/flwm')
-rw-r--r--x11-wm/flwm/ChangeLog7
-rw-r--r--x11-wm/flwm/Manifest10
-rw-r--r--x11-wm/flwm/files/digest-flwm-1.00-r21
-rw-r--r--x11-wm/flwm/files/digest-flwm-1.00-r31
-rw-r--r--x11-wm/flwm/flwm-1.00-r2.ebuild61
-rw-r--r--x11-wm/flwm/flwm-1.00-r3.ebuild59
-rw-r--r--x11-wm/flwm/flwm-1.00-r4.ebuild19
7 files changed, 21 insertions, 137 deletions
diff --git a/x11-wm/flwm/ChangeLog b/x11-wm/flwm/ChangeLog
index f025a4a575d9..86f7295838dd 100644
--- a/x11-wm/flwm/ChangeLog
+++ b/x11-wm/flwm/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-wm/flwm
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.7 2004/06/24 23:41:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.8 2004/08/24 10:25:16 usata Exp $
+
+ 24 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> -flwm-1.00-r2.ebuild,
+ -flwm-1.00-r3.ebuild, flwm-1.00-r4.ebuild:
+ Changed x11-base/xfree to virtual/x11; bug #60787. Integrated into
+ one ebuild.
07 May 2004; Brandon Hale <tseng@gentoo.org> flwm-1.00-r2.ebuild,
flwm-1.00-r3.ebuild, flwm-1.00-r4.ebuild:
diff --git a/x11-wm/flwm/Manifest b/x11-wm/flwm/Manifest
index ab3129aca3ae..098a4abcd394 100644
--- a/x11-wm/flwm/Manifest
+++ b/x11-wm/flwm/Manifest
@@ -1,9 +1,5 @@
-MD5 62e74c232cb7fd1d38f1d1bacbf436d9 flwm-1.00-r4.ebuild 1639
-MD5 b3ebf18d80982e207791e37b866bf663 flwm-1.00-r3.ebuild 1579
-MD5 25f7a3362621bde479de5ba4b78c6632 ChangeLog 1166
+MD5 9e952fc88ecfcc715bd0c1616b5deda6 ChangeLog 1363
+MD5 28930864de8325aee88611fc0c61ed20 flwm-1.00-r4.ebuild 1784
MD5 70b93a47cb23b5eec6774b7dbc9ad702 metadata.xml 330
-MD5 bd52638a546f6c921593921d338aa89f flwm-1.00-r2.ebuild 1677
-MD5 153d0f044aec18fbaa1ea5a6ca417551 files/fltk1.1.patch 376
-MD5 bcffe93a535c096964afbd7e789560d5 files/digest-flwm-1.00-r2 57
-MD5 bcffe93a535c096964afbd7e789560d5 files/digest-flwm-1.00-r3 57
MD5 bcffe93a535c096964afbd7e789560d5 files/digest-flwm-1.00-r4 57
+MD5 153d0f044aec18fbaa1ea5a6ca417551 files/fltk1.1.patch 376
diff --git a/x11-wm/flwm/files/digest-flwm-1.00-r2 b/x11-wm/flwm/files/digest-flwm-1.00-r2
deleted file mode 100644
index 448d78ce713b..000000000000
--- a/x11-wm/flwm/files/digest-flwm-1.00-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75047b2ddcac30eecfb380773177d54d flwm-1.00.tgz 61747
diff --git a/x11-wm/flwm/files/digest-flwm-1.00-r3 b/x11-wm/flwm/files/digest-flwm-1.00-r3
deleted file mode 100644
index 448d78ce713b..000000000000
--- a/x11-wm/flwm/files/digest-flwm-1.00-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75047b2ddcac30eecfb380773177d54d flwm-1.00.tgz 61747
diff --git a/x11-wm/flwm/flwm-1.00-r2.ebuild b/x11-wm/flwm/flwm-1.00-r2.ebuild
deleted file mode 100644
index f21387e2c129..000000000000
--- a/x11-wm/flwm/flwm-1.00-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Michael Conrad Tilstra <tadpol@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.00-r2.ebuild,v 1.12 2004/06/24 23:41:11 agriffis Exp $
-
-IUSE="opengl"
-
-SRC_URI="http://flwm.sourceforge.net/${P}.tgz"
-
-HOMEPAGE="http://flwm.sourceforge.net"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 -ppc"
-
-DESCRIPTION="A lightweight window manager based on fltk"
-
-DEPEND=">=x11-base/xfree-4.0.1
- >=x11-libs/fltk-1.0.11
- opengl? ( virtual/opengl )"
-
- #Configuration of the appearance and behavior of flwm
- #must be done at compile time, i.e. there is
- #no .flwmrc file or interactive configuring while
- #running. To quote the man page, "gcc is your friend,"
- #so this type of configuration must be done at compile
- #time by editing the config.h file. I can't see any
- #way to do this automagically so we'll echo a message
- #in pkg_postinst to tell the user to 'ebuild unpack'
- #and edit the config.h to their liking.
-
-src_compile() {
-
- use opengl && export X_EXTRA_LIBS=-lGL
-
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --host=${CHOST} || die "Configuration Failed"
-
- emake || die "Parallel Make Failed"
-}
-
-src_install() {
-
- doman flwm.1
- dodoc README flwm_wmconfig
-
- into /usr
- dobin flwm
-}
-
-pkg_postinst() {
- einfo "Customization of behaviour and appearance of"
- einfo "flwm requires manually editing the config.h"
- einfo "source file. If you want to change the defaults,"
- einfo "do the following:"
- einfo ""
- einfo "\tebuild ${P}.ebuild unpack"
- einfo "\t${EDITOR} ${S}/config.h "
- einfo "\tebuild ${P} compile install qmerge"
-}
diff --git a/x11-wm/flwm/flwm-1.00-r3.ebuild b/x11-wm/flwm/flwm-1.00-r3.ebuild
deleted file mode 100644
index 643a77c8c869..000000000000
--- a/x11-wm/flwm/flwm-1.00-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.00-r3.ebuild,v 1.9 2004/06/24 23:41:11 agriffis Exp $
-
-IUSE="opengl"
-
-DESCRIPTION="A lightweight window manager based on fltk"
-SRC_URI="http://flwm.sourceforge.net/${P}.tgz"
-HOMEPAGE="http://flwm.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc"
-
-
-DEPEND=">=x11-base/xfree-4.0.1
- =x11-libs/fltk-1.0*
- opengl? ( virtual/opengl )"
-
- #Configuration of the appearance and behavior of flwm
- #must be done at compile time, i.e. there is
- #no .flwmrc file or interactive configuring while
- #running. To quote the man page, "gcc is your friend,"
- #so this type of configuration must be done at compile
- #time by editing the config.h file. I can't see any
- #way to do this automagically so we'll echo a message
- #in pkg_postinst to tell the user to 'ebuild unpack'
- #and edit the config.h to their liking.
-
-src_compile() {
-
- use opengl && export X_EXTRA_LIBS=-lGL
-
- export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.0"
- export LIBS="-L/usr/lib/fltk-1.0"
-
- econf || die
- make || die
-}
-
-src_install() {
-
- doman flwm.1
- dodoc README flwm_wmconfig
-
- into /usr
- dobin flwm
-}
-
-pkg_postinst() {
- einfo "Customization of behaviour and appearance of"
- einfo "flwm requires manually editing the config.h"
- einfo "source file. If you want to change the defaults,"
- einfo "do the following:"
- einfo ""
- einfo "\tebuild ${P}.ebuild unpack"
- einfo "\t${EDITOR} ${S}/config.h "
- einfo "\tebuild ${P} compile install qmerge"
-}
diff --git a/x11-wm/flwm/flwm-1.00-r4.ebuild b/x11-wm/flwm/flwm-1.00-r4.ebuild
index ac2a1024fa5b..b53534111510 100644
--- a/x11-wm/flwm/flwm-1.00-r4.ebuild
+++ b/x11-wm/flwm/flwm-1.00-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.00-r4.ebuild,v 1.6 2004/06/24 23:41:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.00-r4.ebuild,v 1.7 2004/08/24 10:25:16 usata Exp $
inherit eutils
@@ -12,11 +12,11 @@ HOMEPAGE="http://flwm.sourceforge.net"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc ~amd64"
+KEYWORDS="x86 -ppc ~amd64"
-DEPEND=">=x11-base/xfree-4.0.1
- >=x11-libs/fltk-1.1*
+DEPEND="virtual/x11
+ >=x11-libs/fltk-1.0
opengl? ( virtual/opengl )"
#Configuration of the appearance and behavior of flwm
@@ -33,10 +33,15 @@ src_compile() {
use opengl && export X_EXTRA_LIBS=-lGL
- export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.1"
- export LIBS="-L/usr/lib/fltk-1.1"
+ if has_version '>=x11-libs/fltk-1.1' ; then
+ export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.1"
+ export LIBS="-L/usr/lib/fltk-1.1"
- epatch ${FILESDIR}/fltk1.1.patch
+ epatch ${FILESDIR}/fltk1.1.patch
+ else # fltk-1.0
+ export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.0"
+ export LIBS="-L/usr/lib/fltk-1.0"
+ fi
econf || die
make || die