Modular X fixes, bug 147239.

Package-Manager: portage-2.1.2_pre2-r6

6 files changed, 113 insertions, 4 deletions

diff --git a/x11-plugins/astime/ChangeLog b/x11-plugins/astime/ChangeLog
index d668f3a78655..a10a75751d5b 100644
--- a/x11-plugins/astime/ChangeLog
+++ b/x11-plugins/astime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/astime
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/astime/ChangeLog,v 1.7 2006/01/02 10:46:47 s4t4n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/astime/ChangeLog,v 1.8 2006/10/10 19:11:01 kloeri Exp $
+
+*astime-2.8-r1 (10 Oct 2006)
+
+  10 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
+  +files/astime-2.8-gentoo.patch, +astime-2.8-r1.ebuild:
+  Modular X fixes, bug 147239.
 
   02 Jan 2006; Michele Noberasco <s4t4n@gentoo.org> astime-2.8.ebuild:
   Removed LICENSE and INSTALL from dodoc.
diff --git a/x11-plugins/astime/Manifest b/x11-plugins/astime/Manifest
index 0a5b3e2d3aa9..402bacc9eb2e 100644
--- a/x11-plugins/astime/Manifest
+++ b/x11-plugins/astime/Manifest
@@ -1,4 +1,27 @@
-MD5 ddd8a5038ac2a33567e0f8bb0bbaefbd ChangeLog 995
+AUX astime-2.8-gentoo.patch 1032 RMD160 db04d6401bffaf23eedc8464c51231ecc55075fb SHA1 0ef023a609f09e48783eaab4640864a27254d35c SHA256 c0dd4ccf6c59a6879e24316b54a4d77b39ff2ccf38f70598d8a7555a23159775
+MD5 5e0b0e842a47aaa90d3d5c099d91163e files/astime-2.8-gentoo.patch 1032
+RMD160 db04d6401bffaf23eedc8464c51231ecc55075fb files/astime-2.8-gentoo.patch 1032
+SHA256 c0dd4ccf6c59a6879e24316b54a4d77b39ff2ccf38f70598d8a7555a23159775 files/astime-2.8-gentoo.patch 1032
+DIST astime-2.8.tar.gz 49679 RMD160 a8ce6ae59668e495e4c9126c516d51e56ef733c3 SHA1 c32fa36127547da81b1c214a30ba6a36c0ff501b SHA256 e3c4328368ea95b85d67b05cd87355ccbc5066fae1ac07f683690cd7b91c9167
+EBUILD astime-2.8-r1.ebuild 906 RMD160 9d1d0fbde73133a19e4d9276a1e641831d28eaac SHA1 f17f6d9cd487515abf5d3e26c7b7995503caf002 SHA256 2d1b59495067d698ef8b98d381a48e5040d182ccae806b353536e777b0ea3fa4
+MD5 7a9aab5bb4409c081e3ba884fafdd369 astime-2.8-r1.ebuild 906
+RMD160 9d1d0fbde73133a19e4d9276a1e641831d28eaac astime-2.8-r1.ebuild 906
+SHA256 2d1b59495067d698ef8b98d381a48e5040d182ccae806b353536e777b0ea3fa4 astime-2.8-r1.ebuild 906
+EBUILD astime-2.8.ebuild 704 RMD160 20df97b33e1028b96abbc2b0bb7712dafa55341b SHA1 6c2e7c61ffbfce3a4b6692134d0fd4c656e0117f SHA256 fa76097bb0f3b70f251e1f21ce810720b9a1cc07bc259a00c1c1b7526a481d11
 MD5 8a1761ecee0522d175c61e8a0b5ec4f3 astime-2.8.ebuild 704
-MD5 f0fa39b40fbb62aee75a31e80dfd93c0 files/digest-astime-2.8 61
+RMD160 20df97b33e1028b96abbc2b0bb7712dafa55341b astime-2.8.ebuild 704
+SHA256 fa76097bb0f3b70f251e1f21ce810720b9a1cc07bc259a00c1c1b7526a481d11 astime-2.8.ebuild 704
+MISC ChangeLog 1168 RMD160 f50b5e67aeeb1df8b8c8176b6c63ccb28b044164 SHA1 b7015f13641123da9499fb542df46632a712490c SHA256 9bbc4d3503e4b54a57d9dfe47d91d1add97f1923840a32b659689b1879dda505
+MD5 43d214d1db68cc832d668d66a6ffab81 ChangeLog 1168
+RMD160 f50b5e67aeeb1df8b8c8176b6c63ccb28b044164 ChangeLog 1168
+SHA256 9bbc4d3503e4b54a57d9dfe47d91d1add97f1923840a32b659689b1879dda505 ChangeLog 1168
+MISC metadata.xml 163 RMD160 46208909b296ad228342e5181a46ef97a03129c7 SHA1 deae2be5c8bfd52bb2842f43b9dc83a8e9a222a6 SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c
 MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
+RMD160 46208909b296ad228342e5181a46ef97a03129c7 metadata.xml 163
+SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c metadata.xml 163
+MD5 7fcdebaad2faec78c444c7ed09f5bed5 files/digest-astime-2.8 229
+RMD160 9eb5a4bddd3df0df6ebb9a61ad14ae51a5d7dd07 files/digest-astime-2.8 229
+SHA256 c0b6f2d4ef59d5fecf416ec39edfde33d2b96e41fb7080336b3920edf5f785f0 files/digest-astime-2.8 229
+MD5 7fcdebaad2faec78c444c7ed09f5bed5 files/digest-astime-2.8-r1 229
+RMD160 9eb5a4bddd3df0df6ebb9a61ad14ae51a5d7dd07 files/digest-astime-2.8-r1 229
+SHA256 c0b6f2d4ef59d5fecf416ec39edfde33d2b96e41fb7080336b3920edf5f785f0 files/digest-astime-2.8-r1 229
diff --git a/x11-plugins/astime/astime-2.8-r1.ebuild b/x11-plugins/astime/astime-2.8-r1.ebuild
new file mode 100644
index 000000000000..fd556a834ce3
--- /dev/null
+++ b/x11-plugins/astime/astime-2.8-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/astime/astime-2.8-r1.ebuild,v 1.1 2006/10/10 19:11:01 kloeri Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Analogue clock utility for X Windows."
+HOMEPAGE="http://www.tigr.net/"
+SRC_URI="http://www.tigr.net/afterstep/download/astime/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="jpeg"
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libSM
+	jpeg? ( media-libs/jpeg )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	econf $(use_enable jpeg) || die "econf failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install () {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	emake DESTDIR="${D}" install || die
+	dodoc CHANGES README
+}
diff --git a/x11-plugins/astime/files/astime-2.8-gentoo.patch b/x11-plugins/astime/files/astime-2.8-gentoo.patch
new file mode 100644
index 000000000000..52dba297ec87
--- /dev/null
+++ b/x11-plugins/astime/files/astime-2.8-gentoo.patch
@@ -0,0 +1,35 @@
+--- autoconf/Makefile.common.in.orig	1999-05-02 17:12:39.000000000 +0200
++++ autoconf/Makefile.common.in	2006-09-12 00:26:40.000000000 +0200
+@@ -9,11 +9,10 @@
+ install:	install.bin install.man
+ 
+ install.bin:	$(PROG)
+-		$(STRIP) $(PROG)
+-		$(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
++		$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(AFTER_BIN_DIR)
+ 
+ install.man:
+-		$(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x
++		$(INSTALL_DATA) $(PROG).man $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1x
+ 
+ uninstall:
+ 		$(RMF) $(AFTER_BIN_DIR)/$(PROG)
+--- autoconf/Makefile.defines.in.orig	1999-05-02 17:12:39.000000000 +0200
++++ autoconf/Makefile.defines.in	2006-09-12 00:26:58.000000000 +0200
+@@ -2,6 +2,7 @@
+ # Copyright (c) 1998, Guylhem AZNAR <guylhem@oeil.qc.ca>
+ #
+ 
++DESTDIR		=
+ CC		= @CC@
+ CCFLAGS         = @CFLAGS@
+ # -march=pentiumpro -mcpu=pentiumpro
+@@ -21,7 +22,7 @@
+ LEXFLAGS	=
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_PROGRAM	= @INSTALL@ -s -m 755
++INSTALL_PROGRAM	= @INSTALL@ -m 755
+ INSTALL_DATA	= @INSTALL@ -m 644
+ 
+ INCS_X		= @X_CFLAGS@
diff --git a/x11-plugins/astime/files/digest-astime-2.8 b/x11-plugins/astime/files/digest-astime-2.8
index 1aa8e9e54e3b..ee87c010a8a6 100644
--- a/x11-plugins/astime/files/digest-astime-2.8
+++ b/x11-plugins/astime/files/digest-astime-2.8
@@ -1 +1,3 @@
 MD5 0dd21aa79b93b43840649814f2a40fa0 astime-2.8.tar.gz 49679
+RMD160 a8ce6ae59668e495e4c9126c516d51e56ef733c3 astime-2.8.tar.gz 49679
+SHA256 e3c4328368ea95b85d67b05cd87355ccbc5066fae1ac07f683690cd7b91c9167 astime-2.8.tar.gz 49679
diff --git a/x11-plugins/astime/files/digest-astime-2.8-r1 b/x11-plugins/astime/files/digest-astime-2.8-r1
new file mode 100644
index 000000000000..ee87c010a8a6
--- /dev/null
+++ b/x11-plugins/astime/files/digest-astime-2.8-r1
@@ -0,0 +1,3 @@
+MD5 0dd21aa79b93b43840649814f2a40fa0 astime-2.8.tar.gz 49679
+RMD160 a8ce6ae59668e495e4c9126c516d51e56ef733c3 astime-2.8.tar.gz 49679
+SHA256 e3c4328368ea95b85d67b05cd87355ccbc5066fae1ac07f683690cd7b91c9167 astime-2.8.tar.gz 49679