clean up

(Portage version: 2.1.4)

4 files changed, 21 insertions, 53 deletions

diff --git a/x11-plugins/wmxres/ChangeLog b/x11-plugins/wmxres/ChangeLog
index 70e2ba431eeb..b619dc2e84b8 100644
--- a/x11-plugins/wmxres/ChangeLog
+++ b/x11-plugins/wmxres/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmxres
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/ChangeLog,v 1.6 2007/07/22 04:15:24 dberkholz Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/ChangeLog,v 1.7 2008/01/12 13:57:08 drac Exp $
+
+  12 Jan 2008; Samuli Suominen <drac@gentoo.org> -files/wmxres.desktop,
+  -files/wmxres-makefile.patch, wmxres-1.2.ebuild:
+  Clean up.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmxres-1.2.ebuild:
   Drop virtual/x11 references.
diff --git a/x11-plugins/wmxres/files/wmxres-makefile.patch b/x11-plugins/wmxres/files/wmxres-makefile.patch
deleted file mode 100644
index 62ec6cf3face..000000000000
--- a/x11-plugins/wmxres/files/wmxres-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.orig	2004-08-23 17:25:43.471717952 +0000
-+++ Makefile	2004-08-23 17:27:37.009457592 +0000
-@@ -2,10 +2,11 @@
- LIBDIR	=	-L/usr/X11R6/lib
- LIBS	=	-lXpm -lXext -lX11 -lXxf86vm
- OBJS	=	wmxres/wmxres.o \
--		wmgeneral/wmgeneral.o \
-+		wmgeneral/wmgeneral.o
-+GCFLAGS =
- 
- .c.o:
--	cc -g -c -O2 -Wall -D$(shell echo `uname -s`) $< -o $*.o $(INCDIR)
-+	cc -g -c -Wall -D$(shell echo `uname -s`) $(GCFLAGS) $< -o $*.o $(INCDIR)
- 
- all: wmxres
- 
diff --git a/x11-plugins/wmxres/files/wmxres.desktop b/x11-plugins/wmxres/files/wmxres.desktop
deleted file mode 100644
index 46f67941877b..000000000000
--- a/x11-plugins/wmxres/files/wmxres.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=WmXres
-Comment=Change resolution
-Comment[pl]=Zmiana rozdzielczości
-Exec=wmxres
-Terminal=false
-Type=Application
-Categories=Applet;
-NotShowIn=GNOME;KDE;
-Encoding=UTF-8
-# vi: encoding=utf-8
diff --git a/x11-plugins/wmxres/wmxres-1.2.ebuild b/x11-plugins/wmxres/wmxres-1.2.ebuild
index 5b7f5d1d3563..03c5fade7bfa 100644
--- a/x11-plugins/wmxres/wmxres-1.2.ebuild
+++ b/x11-plugins/wmxres/wmxres-1.2.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/wmxres-1.2.ebuild,v 1.5 2007/07/22 04:15:24 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/wmxres-1.2.ebuild,v 1.6 2008/01/12 13:57:08 drac Exp $
 
-inherit eutils
-
-IUSE=""
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Dock application to select your display mode among those possible"
+HOMEPAGE="http://yalla.free.fr/wn"
 SRC_URI="http://yalla.free.fr/wn/${PN}-1.1-0.tar.gz"
-HOMEPAGE="http://yalla.free.fr/wn/"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 x86 ~ppc"
+IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
@@ -19,34 +22,22 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 	x11-proto/xf86dgaproto"
 
-SLOT="0"
-LICENSE="GPL-1"
-KEYWORDS="x86 ~ppc"
-
-S="${WORKDIR}/${PN}.app"
+S=${WORKDIR}/${PN}.app
 
 src_unpack() {
-
 	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-makefile.patch
+	cd "${S}"
 	epatch ${FILESDIR}/${PN}-debian-1.1-1.2.patch
-
+	sed -e "s:-g -c -O2:${CFLAGS} -c:" \
+		-e "s:cc:$(tc-getCC):g" -i Makefile
 }
 
 src_compile() {
-
-	emake GCFLAGS="${CFLAGS}" || die "make failed"
-
+	emake INCDIR="-I/usr/include" \
+		LIBDIR="-L/usr/$(get_libdir)" || die "emake failed."
 }
 
 src_install() {
-
 	dobin ${PN}/${PN}
 	doman ${PN}.1
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
-
 }