Don't override "MAKEOPTS". Moved net-irc/xchat into "RDEPEND" and "DEPEND". Made CFLAGS aware.

4 files changed, 49 insertions, 23 deletions

diff --git a/net-irc/xchat-systray/ChangeLog b/net-irc/xchat-systray/ChangeLog
index 43f03500f9a3..e5b028786cc7 100644
--- a/net-irc/xchat-systray/ChangeLog
+++ b/net-irc/xchat-systray/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat-systray
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/ChangeLog,v 1.7 2004/07/20 23:18:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/ChangeLog,v 1.8 2004/07/20 23:44:11 swegener Exp $
+
+  21 Jul 2004; Sven Wegener <swegener@gentoo.org> xchat-systray-2.3.1.ebuild,
+  xchat-systray-2.4.0.ebuild:
+  Don't override "MAKEOPTS". Moved net-irc/xchat into "RDEPEND" and "DEPEND".
+  Made CFLAGS aware.
 
   21 Jul 2004; Sven Wegener <swegener@gentoo.org> metadata.xml:
   Moved package to the net-irc herd.
diff --git a/net-irc/xchat-systray/Manifest b/net-irc/xchat-systray/Manifest
index 763082f1057e..72423078c657 100644
--- a/net-irc/xchat-systray/Manifest
+++ b/net-irc/xchat-systray/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8e6f8e2804a32cda9a4736f332da0e0f ChangeLog 1051
+MD5 c67cf59d382272bbf3b716c0ec7f8a4c ChangeLog 1259
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 b141b737d8c5cd48e5d8b2493d44c3f9 xchat-systray-2.3.1.ebuild 790
-MD5 ee418d4a16d81147d5e4fe0566fdb22e xchat-systray-2.4.0.ebuild 791
+MD5 70f321749d4f588c455d3fce79f46288 xchat-systray-2.3.1.ebuild 886
+MD5 20722b00254cfb799d1b00ab87bc63d8 xchat-systray-2.4.0.ebuild 883
 MD5 9a65d335f20aacff5764eae11d496abc files/digest-xchat-systray-2.3.1 77
 MD5 1a8c5c044d17c5ce8aa84c24f8ca3978 files/digest-xchat-systray-2.4.0 86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFA/ajcAXomK8S72HoRAg8JAJ9VReWmytAfENNZQTtQH94NQI/i9wCeOkeQ
-N8fASjbdLv5fErlfPqTY4IA=
-=ggr3
+iD8DBQFA/a6WAXomK8S72HoRAmD/AKCCKno1MKTga/6g5+UzqZSZsPhuFQCfRi7r
+FA8J9c08PX1WozBHbWdJ0go=
+=Z8wO
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat-systray/xchat-systray-2.3.1.ebuild b/net-irc/xchat-systray/xchat-systray-2.3.1.ebuild
index f626344729dc..8c849ced5ab7 100644
--- a/net-irc/xchat-systray/xchat-systray-2.3.1.ebuild
+++ b/net-irc/xchat-systray/xchat-systray-2.3.1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/xchat-systray-2.3.1.ebuild,v 1.7 2004/06/24 23:10:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/xchat-systray-2.3.1.ebuild,v 1.8 2004/07/20 23:44:11 swegener Exp $
+
+MY_P=${PN}-plugin_${PV}
 
-S=${WORKDIR}/${PN}-plugin_${PV}
 DESCRIPTION="KDE/GNOME system tray plugin for X-Chat."
-SRC_URI="http://blight.altervista.org/Downloads/${PN}-plugin_${PV}.tar.gz"
+SRC_URI="http://blight.altervista.org/Downloads/${MY_P}.tar.gz"
 HOMEPAGE="http://blight.altervista.org/"
 
 LICENSE="GPL-2"
@@ -14,18 +15,27 @@ IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0.3
 	>=x11-libs/gtk+-2.0.3
-	sys-devel/gettext"
+	>=net-irc/xchat-2.0.3"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.7
-	>=net-irc/xchat-2.0.3"
+	sys-devel/gettext
+	>=sys-apps/sed-4"
 
-src_compile() {
+S=${WORKDIR}/${MY_P}
 
-	MAKEOPTS="-j1" emake || die "Compile failed"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i -e "s/-O2 -Wall/${CFLAGS}/" Makefile
+}
+
+src_compile() {
+	emake -j1 || die "Compile failed"
 }
 
 src_install() {
-	insinto /usr/lib/xchat/plugins
-	doins systray.so
+	exeinto /usr/lib/xchat/plugins
+	doexe systray.so
 }
diff --git a/net-irc/xchat-systray/xchat-systray-2.4.0.ebuild b/net-irc/xchat-systray/xchat-systray-2.4.0.ebuild
index ad8bac4e8e72..d9e89fdcd15d 100644
--- a/net-irc/xchat-systray/xchat-systray-2.4.0.ebuild
+++ b/net-irc/xchat-systray/xchat-systray-2.4.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/xchat-systray-2.4.0.ebuild,v 1.4 2004/06/24 23:10:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-systray/xchat-systray-2.4.0.ebuild,v 1.5 2004/07/20 23:44:11 swegener Exp $
+
+MY_P=${PN}-integration-${PV}
 
-S=${WORKDIR}/${PN}-integration-${PV}
 DESCRIPTION="System tray plugin for X-Chat."
-SRC_URI="mirror://sourceforge/xchat2-plugins/${PN}-integration-${PV}-src.tar.gz"
+SRC_URI="mirror://sourceforge/xchat2-plugins/${MY_P}-src.tar.gz"
 HOMEPAGE="http://blight.altervista.org/"
 
 LICENSE="GPL-2"
@@ -18,13 +19,23 @@ RDEPEND=">=dev-libs/glib-2.0.3
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	>=dev-util/pkgconfig-0.7"
+	>=dev-util/pkgconfig-0.7
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i -e "s/-O2 -Wall/${CFLAGS}/" Makefile
+}
 
 src_compile() {
-	MAKEOPTS="-j1" emake || die "Compile failed"
+	emake -j1 || die "Compile failed"
 }
 
 src_install() {
-	insinto /usr/lib/xchat/plugins
-	doins systray.so
+	exeinto /usr/lib/xchat/plugins
+	doexe systray.so
 }