clean up

Package-Manager: portage-2.1.4

5 files changed, 29 insertions, 69 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/Manifest b/x11-plugins/wmxres/Manifest
index 0a9f68f9d60a..d380f6a53bcb 100644
--- a/x11-plugins/wmxres/Manifest
+++ b/x11-plugins/wmxres/Manifest
@@ -2,23 +2,15 @@ AUX wmxres-debian-1.1-1.2.patch 1699 RMD160 1686239bd8c30a14d118c174492a6e4f8de7
 MD5 19ac74b1720f8fc5c6678e4830b0b016 files/wmxres-debian-1.1-1.2.patch 1699
 RMD160 1686239bd8c30a14d118c174492a6e4f8de7659a files/wmxres-debian-1.1-1.2.patch 1699
 SHA256 79f5a5204ade63f83553856a8bfe47258287e40f4a7a894c00a8c203e4eff7f1 files/wmxres-debian-1.1-1.2.patch 1699
-AUX wmxres-makefile.patch 445 RMD160 cc004786bcf7cf850dc7ed76681b3c540f0baed0 SHA1 e45c1483d57f1c18769e911ad6655c128622194c SHA256 b1e5233d044cbea546e6f952025e97c59b654ceb6d59757f175caa941a07fe3b
-MD5 7faef3c2696850855d3c04cf2db18b0b files/wmxres-makefile.patch 445
-RMD160 cc004786bcf7cf850dc7ed76681b3c540f0baed0 files/wmxres-makefile.patch 445
-SHA256 b1e5233d044cbea546e6f952025e97c59b654ceb6d59757f175caa941a07fe3b files/wmxres-makefile.patch 445
-AUX wmxres.desktop 209 RMD160 cc99acf983009ba3f433cfc4a94d22d79f1f4b83 SHA1 0fef3c36f3b5a7b468e8a4bdb30785c573450d4c SHA256 f7afa7be30398eb4d0794f822baca944ee63feb0cd60f996b59c2179deefde6b
-MD5 ecbe1a6bd91322603485bc0ab1198599 files/wmxres.desktop 209
-RMD160 cc99acf983009ba3f433cfc4a94d22d79f1f4b83 files/wmxres.desktop 209
-SHA256 f7afa7be30398eb4d0794f822baca944ee63feb0cd60f996b59c2179deefde6b files/wmxres.desktop 209
 DIST wmxres-1.1-0.tar.gz 9948 RMD160 7e492e5ac958d0467bdbdbba94eb4c008b97d55e SHA1 160589ea8acd74a2e0c7152a02c463d5d20a57fa SHA256 c6d1e0fbc1dce2aa9d35f1558b8d561c12677229a89b7f0a062679096f8a3b33
-EBUILD wmxres-1.2.ebuild 986 RMD160 d629ded5c340327679f2d0cb6a5617213c660342 SHA1 d6cc3c18476c9f311aabb96ce0fbd54425dbc856 SHA256 0261ff40be024985b502e1f3b344206c5698e01357abc60257963fed97d23b6d
-MD5 feaec5c1f1e7635c5bf0a420123107a8 wmxres-1.2.ebuild 986
-RMD160 d629ded5c340327679f2d0cb6a5617213c660342 wmxres-1.2.ebuild 986
-SHA256 0261ff40be024985b502e1f3b344206c5698e01357abc60257963fed97d23b6d wmxres-1.2.ebuild 986
-MISC ChangeLog 841 RMD160 cb45a80882b5d26fa30db959ffaf177c25b22b99 SHA1 e01f2a8093321755df9751521c8fb667979ed9e0 SHA256 f861bcf2857bc4d1706394173b1229c4631c86b5c302171de9286ffe622765e7
-MD5 0333cafca1722455ccc543acd2b2e37d ChangeLog 841
-RMD160 cb45a80882b5d26fa30db959ffaf177c25b22b99 ChangeLog 841
-SHA256 f861bcf2857bc4d1706394173b1229c4631c86b5c302171de9286ffe622765e7 ChangeLog 841
+EBUILD wmxres-1.2.ebuild 1012 RMD160 cb2aa68d1563fb848c270d63b04bc81e816fd113 SHA1 110761312775ee7afe6cac19ef2ea8230d5ce560 SHA256 fd12612cdf6acfc1a911b3e8e9e4c26550ef05ecb583ef1d70937addf5d18fd5
+MD5 c5aced18ec54c5a6185d5625098ee6a1 wmxres-1.2.ebuild 1012
+RMD160 cb2aa68d1563fb848c270d63b04bc81e816fd113 wmxres-1.2.ebuild 1012
+SHA256 fd12612cdf6acfc1a911b3e8e9e4c26550ef05ecb583ef1d70937addf5d18fd5 wmxres-1.2.ebuild 1012
+MISC ChangeLog 972 RMD160 ffdfd6340e973458c2500785c2d71822f8ff50df SHA1 624b7ef08ff010e345d4848a2efab73763e8944e SHA256 3856e4f566586e670e3887e06e03f683a67919851a581cecec1787aa6b1743f2
+MD5 396892b548f22eed04f9113162544df6 ChangeLog 972
+RMD160 ffdfd6340e973458c2500785c2d71822f8ff50df ChangeLog 972
+SHA256 3856e4f566586e670e3887e06e03f683a67919851a581cecec1787aa6b1743f2 ChangeLog 972
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
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
-
 }