Fix depends wrt #204546. Call xmkmf without -a since it's not needed. Drop false .desktop entry. Respect CC target.

Package-Manager: portage-2.1.4_rc14

4 files changed, 37 insertions, 56 deletions

diff --git a/x11-plugins/wmdate/ChangeLog b/x11-plugins/wmdate/ChangeLog
index b31c44473975..a5b70f9bbf4b 100644
--- a/x11-plugins/wmdate/ChangeLog
+++ b/x11-plugins/wmdate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmdate
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdate/ChangeLog,v 1.10 2007/02/06 01:59:33 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdate/ChangeLog,v 1.11 2008/01/06 21:01:19 drac Exp $
+
+  06 Jan 2008; Samuli Suominen <drac@gentoo.org> -files/wmdate.desktop,
+  wmdate-0.7.ebuild:
+  Fix depends wrt #204546. Call xmkmf without -a since it's not needed. Drop
+  false .desktop entry. Respect CC target.
 
   06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/x11-plugins/wmdate/Manifest b/x11-plugins/wmdate/Manifest
index aa0d9048fe09..5400fd2882a7 100644
--- a/x11-plugins/wmdate/Manifest
+++ b/x11-plugins/wmdate/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wmdate-ComplexProgramTargetNoMan.patch 349 RMD160 3f9d6fb50a3dca617748b99eae4566d02249ba3e SHA1 e7e2cc0950139b919b0877391decc01fc1c75024 SHA256 d9af230cfcaaebb5952df9cde402bae994e1a46e9e7ece96b58b2fe0355c0a55
 MD5 a842ee25f4a612037b0b05c2b05f7fe7 files/wmdate-ComplexProgramTargetNoMan.patch 349
 RMD160 3f9d6fb50a3dca617748b99eae4566d02249ba3e files/wmdate-ComplexProgramTargetNoMan.patch 349
 SHA256 d9af230cfcaaebb5952df9cde402bae994e1a46e9e7ece96b58b2fe0355c0a55 files/wmdate-ComplexProgramTargetNoMan.patch 349
-AUX wmdate.desktop 210 RMD160 cdac2c0aff2b49e9549b3c9a4c92b32db0e75543 SHA1 cacfb5a567f11eaace2a8584c7dc2544d7810d26 SHA256 9e6cd9384de51dc03a75d374dac30fabbfc2fe76489b5f30c6fcbc8dd5c36251
-MD5 cbce7d60a34c9e6e85e1ceca103ba8b0 files/wmdate.desktop 210
-RMD160 cdac2c0aff2b49e9549b3c9a4c92b32db0e75543 files/wmdate.desktop 210
-SHA256 9e6cd9384de51dc03a75d374dac30fabbfc2fe76489b5f30c6fcbc8dd5c36251 files/wmdate.desktop 210
 DIST wmdate-0.7.tar.gz 10645 RMD160 d16dd5f0683ac3e02be1159e32263339951064ea SHA1 55112f243f927a4354bd36d7c469d8a2d8bed8b0 SHA256 e246e38a7488470d271dc5262f526462821fa4337c3e07bda8b9b3f9e7b8d975
-EBUILD wmdate-0.7.ebuild 933 RMD160 e2366cb741be94c230e08c9d8277f88039f8ff28 SHA1 f5ef644ab3bc86f65e749808f579b12533a1a412 SHA256 e84dcb86b926d9564db25b5a5bae3416f98ca39283c463eadf56071750edc934
-MD5 4d75ac39d5fdf82bdf33aa2576c33f37 wmdate-0.7.ebuild 933
-RMD160 e2366cb741be94c230e08c9d8277f88039f8ff28 wmdate-0.7.ebuild 933
-SHA256 e84dcb86b926d9564db25b5a5bae3416f98ca39283c463eadf56071750edc934 wmdate-0.7.ebuild 933
-MISC ChangeLog 1251 RMD160 7dbf341f05f54fc12760ca273f4f868ed73fbdcd SHA1 35985e1fe088d6a705560b073126db42275f62db SHA256 dd6a69ddcf0a4ebe9b865985f89d17690219dd9d68834bb3f8afbcd86a8c722b
-MD5 c4c59c58007e18214f0b47a9512576c5 ChangeLog 1251
-RMD160 7dbf341f05f54fc12760ca273f4f868ed73fbdcd ChangeLog 1251
-SHA256 dd6a69ddcf0a4ebe9b865985f89d17690219dd9d68834bb3f8afbcd86a8c722b ChangeLog 1251
+EBUILD wmdate-0.7.ebuild 950 RMD160 c306ba475560424cb05bba5b03f026b17de172c1 SHA1 e35d75595a36a5f727eae28f1593d4f7674770cd SHA256 7789c24749a9b7f189302240f07ef4dbf1874115df61af1bef11c673a2661ae6
+MD5 416c6c28d4f2ec67bccd1b42e5e644af wmdate-0.7.ebuild 950
+RMD160 c306ba475560424cb05bba5b03f026b17de172c1 wmdate-0.7.ebuild 950
+SHA256 7789c24749a9b7f189302240f07ef4dbf1874115df61af1bef11c673a2661ae6 wmdate-0.7.ebuild 950
+MISC ChangeLog 1460 RMD160 d7d9a674985df463e3e4bbd64cf8054470d94f59 SHA1 6e785be7bf85d4df45f4703ce75f13eefeaba677 SHA256 658fc3ea1d458585e2463063771ea333839c314ae324117134bf342660c83ea5
+MD5 9076e7863a1fddc265be1317c7577eb0 ChangeLog 1460
+RMD160 d7d9a674985df463e3e4bbd64cf8054470d94f59 ChangeLog 1460
+SHA256 658fc3ea1d458585e2463063771ea333839c314ae324117134bf342660c83ea5 ChangeLog 1460
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
@@ -25,10 +18,3 @@ SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b metadata
 MD5 2ef500290c9fb11c46f3a3a520cd13b2 files/digest-wmdate-0.7 229
 RMD160 a202380b2b66d680937f55056ce65dcc0faa0df1 files/digest-wmdate-0.7 229
 SHA256 1a05294104acbda44a67687a58967ad7a2848cf4e35f1c1d17493c7e49fa535d files/digest-wmdate-0.7 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFx+EMAiZjviIA2XgRAhWSAJ9EBsUwLSx90yS/K9YvfbstKOiMcQCdGRMi
-BMxCcjd3zYnLib9b+k3hrZ4=
-=HT1K
------END PGP SIGNATURE-----
diff --git a/x11-plugins/wmdate/files/wmdate.desktop b/x11-plugins/wmdate/files/wmdate.desktop
deleted file mode 100644
index 6866e667cf64..000000000000
--- a/x11-plugins/wmdate/files/wmdate.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=WmDate
-Comment=Dockable date-display utility for X11
-Comment[pl]=Dokowalny wyświetlacz daty dla X11
-Exec=wmdate
-Type=Application
-Encoding=UTF-8
-Terminal=0
-Categories=Application;Calendar;
diff --git a/x11-plugins/wmdate/wmdate-0.7.ebuild b/x11-plugins/wmdate/wmdate-0.7.ebuild
index 09f0c50232a7..15dde2af1d78 100644
--- a/x11-plugins/wmdate/wmdate-0.7.ebuild
+++ b/x11-plugins/wmdate/wmdate-0.7.ebuild
@@ -1,40 +1,39 @@
-# Copyright 1999-2006 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/wmdate/wmdate-0.7.ebuild,v 1.9 2006/01/24 22:59:20 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdate/wmdate-0.7.ebuild,v 1.10 2008/01/06 21:01:19 drac Exp $
 
-inherit eutils
-
-IUSE=""
+inherit eutils toolchain-funcs
 
 DESCRIPTION="yet another date-display dock application"
-SRC_URI="http://solfertje.student.utwente.nl/~dalroi/${PN}/files/${P}.tar.gz"
 HOMEPAGE="http://solfertje.student.utwente.nl/~dalroi/applications.php"
+SRC_URI="http://solfertje.student.utwente.nl/~dalroi/${PN}/files/${P}.tar.gz"
 
-DEPEND="x11-libs/libdockapp"
-
+LICENSE="as-is"
 SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ppc64 ~sparc amd64"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libdockapp
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
+	x11-misc/imake"
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-ComplexProgramTargetNoMan.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-ComplexProgramTargetNoMan.patch
 }
 
 src_compile() {
-	cd ${S}
-	PATH="$PATH:/usr/X11R6/bin"
-	xmkmf -a
-	emake CDEBUGFLAGS="${CFLAGS}" || die "make failed"
+	xmkmf || die "xmkmf failed."
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+		|| die "emake failed."
 }
 
 src_install() {
-	einstall DESTDIR=${D} BINDIR=/usr/bin || DIE "make install failed"
-
-	dodoc README
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
+	dobin ${PN}
+	dodoc Changelog README
 }