added X and xosd use flag

12 files changed, 85 insertions, 161 deletions

diff --git a/x11-misc/hotkeys/ChangeLog b/x11-misc/hotkeys/ChangeLog
index c4ba734f7393..8b69b1e4f81b 100644
--- a/x11-misc/hotkeys/ChangeLog
+++ b/x11-misc/hotkeys/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/hotkeys
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/hotkeys/ChangeLog,v 1.11 2003/08/01 13:53:15 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/hotkeys/ChangeLog,v 1.12 2003/08/15 11:25:28 lanius Exp $
+
+  15 Aug 2003; Heinrich Wendel <lanius@gentoo.org> hotkeys-0.5.4.ebuild,
+  hotkeys-0.5.5.ebuild, metadata.xml, files/hotkeys-0.5.4-gentoo.diff.gz,
+  files/hotkeys-0.5.5-gentoo.diff, files/hotkeys-0.5.7.1-r1-gentoo.diff:
+  added xosd and X useflag
+
+  15 Aug 2003; Heinrich Wendel <lanius@gentoo.org> hotkeys-0.5.4.ebuild,
+  hotkeys-0.5.5.ebuild:
+  added X and xosd use flag
 
   01 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> hotkeys-0.5.7.1.ebuild:
   Block on db4
diff --git a/x11-misc/hotkeys/Manifest b/x11-misc/hotkeys/Manifest
index fd8d700e34d1..c54714633699 100644
--- a/x11-misc/hotkeys/Manifest
+++ b/x11-misc/hotkeys/Manifest
@@ -1,7 +1,8 @@
-MD5 ee9b3a4c43bbdd0ed3c4db7b58d09745 hotkeys-0.5.7.1-r1.ebuild 1160
-MD5 db9d8f3442b92433a9f8c4a833b6952a ChangeLog 1422
+MD5 323f7786418bc9e63316328fe1d8300c hotkeys-0.5.7.1-r1.ebuild 1158
+MD5 102e1ea97aa07518dac23932d8eed040 ChangeLog 1670
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 718a70fb145ea461d426a7d663194f8b hotkeys-0.5.7.1.ebuild 963
+MD5 271ec5a699afabc5f0376bb5a9be4fe7 files/hotkeys-0.5.7.1-r1-gentoo.diff 325
 MD5 26aa28d3165265b8153adbb4a071d0af files/digest-hotkeys-0.5.7.1-r1 67
 MD5 26aa28d3165265b8153adbb4a071d0af files/digest-hotkeys-0.5.7.1 67
 MD5 ceb23c573710586557d5f664975c6740 files/hotkeys-0.5.7.1-gentoo.diff 538
diff --git a/x11-misc/hotkeys/files/digest-hotkeys-0.5.4 b/x11-misc/hotkeys/files/digest-hotkeys-0.5.4
deleted file mode 100644
index f63a40da8fca..000000000000
--- a/x11-misc/hotkeys/files/digest-hotkeys-0.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50810778bf50c769a39cd44ba59fd14a hotkeys_0.5.4.tar.gz 378334
diff --git a/x11-misc/hotkeys/files/digest-hotkeys-0.5.5 b/x11-misc/hotkeys/files/digest-hotkeys-0.5.5
deleted file mode 100644
index 8460aa1b35da..000000000000
--- a/x11-misc/hotkeys/files/digest-hotkeys-0.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b46502efec8f2dad776b473482b4368 hotkeys-0.5.5.tar.bz2 342193
diff --git a/x11-misc/hotkeys/files/digest-hotkeys-0.5.7.1-r1 b/x11-misc/hotkeys/files/digest-hotkeys-0.5.7.1-r1
new file mode 100644
index 000000000000..9c3c845c6e2c
--- /dev/null
+++ b/x11-misc/hotkeys/files/digest-hotkeys-0.5.7.1-r1
@@ -0,0 +1 @@
+MD5 68e2aea6b4444f943b5f85ac00542a1c hotkeys_0.5.7.1.tar.gz 234289
diff --git a/x11-misc/hotkeys/files/hotkeys-0.5.4-gentoo.diff.gz b/x11-misc/hotkeys/files/hotkeys-0.5.4-gentoo.diff.gz
deleted file mode 100644
index d03c41c9add8..000000000000
--- a/x11-misc/hotkeys/files/hotkeys-0.5.4-gentoo.diff.gz
+++ /dev/null
diff --git a/x11-misc/hotkeys/files/hotkeys-0.5.5-gentoo.diff b/x11-misc/hotkeys/files/hotkeys-0.5.5-gentoo.diff
deleted file mode 100644
index d65f92424e96..000000000000
--- a/x11-misc/hotkeys/files/hotkeys-0.5.5-gentoo.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- ./src/kbddef.c.xml2 Sun Jun  2 22:37:33 2002
-+++ ./src/kbddef.c      Sun Jun  2 22:37:43 2002
-@@ -38,7 +38,7 @@
- #include "XF86keysym.h"
-
- #include <xmlmemory.h>
--#include <parser.h>
-+#include <libxml2/libxml/parser.h>
-
- #include "hotkeys.h"
- #include "kbddef.h"
---- ./configure.xml2    Mon Oct 29 12:47:31 2001
-+++ ./configure Sun Jun  2 22:37:17 2002
-@@ -2189,14 +2189,14 @@
-     CFLAGS="$CFLAGS $XML_CFLAGS"
-     LIBS="$LIBS $XML_LIBS"
-
--    echo $ac_n "checking for xmlParseFile in -lxml""... $ac_c" 1>&6
--echo "configure:2194: checking for xmlParseFile in -lxml" >&5
-+    echo $ac_n "checking for xmlParseFile in -lxml2""... $ac_c" 1>&6
-+echo "configure:2194: checking for xmlParseFile in -lxml22" >&5
- ac_lib_var=`echo xml'_'xmlParseFile | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lxml  $LIBS"
-+LIBS="-lxml2  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2202 "configure"
- #include "confdefs.h"
-@@ -2230,7 +2230,7 @@
- #define $ac_tr_lib 1
- EOF
-
--  LIBS="-lxml $LIBS"
-+  LIBS="-lxml2 $LIBS"
-
- else
-   echo "$ac_t""no" 1>&6
-@@ -2247,7 +2247,7 @@
- #line 2248 "configure"
- #include "confdefs.h"
-
--    #include <parser.h>
-+    #include <libxml2/libxml/parser.h>
-     int main ()
-     {
- #ifdef xmlChildrenNode
-
---- /tmp/kbddef.c       Wed Sep 11 18:51:19 2002
-+++ src/kbddef.c        Wed Sep 11 18:51:33 2002
-@@ -37,7 +37,7 @@
-  */
- #include "XF86keysym.h"
-
--#include <xmlmemory.h>
-+#include <libxml2/libxml/xmlmemory.h>
- #include <libxml2/libxml/parser.h>
-
- #include "hotkeys.h"
-
---- /tmp/configure	Wed Sep 11 19:02:34 2002
-+++ configure	Wed Sep 11 19:03:12 2002
-@@ -2447,10 +2447,10 @@
- 
- 
-     if test ! x$xosd_libdir = x; then
--        LIBS="$LIBS -L$xosd_libdir"
-+        LIBS="-L$xosd_libdir $LIBS"
-     fi
-     if test ! x$xosd_incdir = x; then
--        CPPFLAGS="$CPPFLAGS -I$xosd_incdir"
-+        CPPFLAGS="-I$xosd_incdir $CPPFLAGS"
-     fi
- 
-     if test "x$enable_xosd" = "xyes"
diff --git a/x11-misc/hotkeys/files/hotkeys-0.5.7.1-r1-gentoo.diff b/x11-misc/hotkeys/files/hotkeys-0.5.7.1-r1-gentoo.diff
new file mode 100644
index 000000000000..b76c8dd9822b
--- /dev/null
+++ b/x11-misc/hotkeys/files/hotkeys-0.5.7.1-r1-gentoo.diff
@@ -0,0 +1,13 @@
+--- src/kbddef.c.org	2003-08-15 13:20:45.000000000 +0200
++++ src/kbddef.c	2003-08-15 13:21:06.000000000 +0200
+@@ -37,8 +37,8 @@
+  */
+ #include "XF86keysym.h"
+ 
+-#include <xmlmemory.h>
+-#include <parser.h>
++#include <libxml2/libxml/xmlmemory.h>
++#include <libxml2/libxml/parser.h>
+ 
+ #include "hotkeys.h"
+ #include "kbddef.h"
diff --git a/x11-misc/hotkeys/hotkeys-0.5.4.ebuild b/x11-misc/hotkeys/hotkeys-0.5.4.ebuild
deleted file mode 100644
index 28be186ea917..000000000000
--- a/x11-misc/hotkeys/hotkeys-0.5.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/hotkeys/hotkeys-0.5.4.ebuild,v 1.9 2003/02/13 17:14:18 vapier Exp $
-
-NAME="hotkeys"
-S=${WORKDIR}/${P}
-DESCRIPTION="Make use of extra buttons on newer keyboards."
-SRC_URI="http://ypwong.org/hotkeys/hotkeys_0.5.4.tar.gz"
-HOMEPAGE="http://ypwong.org/hotkeys/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-DEPEND="virtual/x11
-	virtual/glibc
-	dev-libs/libxml2
-	>=sys-libs/db-3.2.3
-	=x11-libs/xosd-0.7.0"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	zcat ${FILESDIR}/${P}-gentoo.diff.gz | patch -p0
-}
-
-src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--libdir=/usr/lib/xosd-0.7.0 \
-		--includedir=/usr/include/xosd-0.7.0 \
-		--sysconfdir=/etc || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS ChangeLog COPYING README TODO
-}
-
diff --git a/x11-misc/hotkeys/hotkeys-0.5.5.ebuild b/x11-misc/hotkeys/hotkeys-0.5.5.ebuild
deleted file mode 100644
index 27f644001259..000000000000
--- a/x11-misc/hotkeys/hotkeys-0.5.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/hotkeys/hotkeys-0.5.5.ebuild,v 1.8 2003/02/13 17:14:24 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Make use of extra buttons on newer keyboards."
-SRC_URI="http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/${P}.tar.bz2"
-HOMEPAGE="http://ypwong.org/hotkeys/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="virtual/x11
-	dev-libs/libxml2
-	>=sys-libs/db-3.2.9
-	~x11-libs/xosd-0.7.0"
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-	econf \
-		--with-xosd-lib=/usr/lib/xosd-0.7.0 \
-		--with-xosd-inc=/usr/include/xosd-0.7.0 \
-		|| die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS ChangeLog COPYING README TODO
-}
diff --git a/x11-misc/hotkeys/hotkeys-0.5.7.1-r1.ebuild b/x11-misc/hotkeys/hotkeys-0.5.7.1-r1.ebuild
new file mode 100644
index 000000000000..e33db07bc504
--- /dev/null
+++ b/x11-misc/hotkeys/hotkeys-0.5.7.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/hotkeys/hotkeys-0.5.7.1-r1.ebuild,v 1.1 2003/08/15 11:25:28 lanius Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Make use of extra buttons on newer keyboards."
+SRC_URI="http://ypwong.org/hotkeys/${PV}/${PN}_${PV}.tar.gz"
+HOMEPAGE="http://ypwong.org/hotkeys/"
+IUSE="X gtk2 xosd"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+
+DEPEND="X? ( virtual/x11 )
+	>=dev-libs/libxml2-2.2.8
+	=sys-libs/db-3.2*
+	!>=sys-libs/db-4*
+	xosd? ( >=x11-libs/xosd-1.0.0 )
+	gtk2? ( >=x11-libs/gtk+-2.0.0 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+}
+
+src_compile() {
+
+	use X \
+		&& myconf="${myconf} --with-X" \
+		|| myconf="${myconf} --without-X"
+
+	use xosd \
+		&& myconf="${myconf} --with-xosd" \
+		|| myconf="${myconf} --without-xosd"
+
+	use gtk2 \
+		&& myconf="${myconf} --with-gtk" \
+		|| myconf="${myconf} --without-gtk"
+
+	econf ${myconf} || die "./configure failed"
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS ChangeLog COPYING README TODO
+}
diff --git a/x11-misc/hotkeys/metadata.xml b/x11-misc/hotkeys/metadata.xml
new file mode 100644
index 000000000000..c3504b40c506
--- /dev/null
+++ b/x11-misc/hotkeys/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>lanius@gentoo.org</email>
+  <name>Heinrich Wendel</name>
+</maintainer>
+</pkgmetadata>