diff options
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/grdesktop/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/grdesktop/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/grdesktop/files/0010_all_0.22-remove-double-makefile-syntax.patch | 25 | ||||
| -rw-r--r-- | net-misc/grdesktop/grdesktop-0.22-r1.ebuild | 15 |
4 files changed, 43 insertions, 7 deletions
diff --git a/net-misc/grdesktop/ChangeLog b/net-misc/grdesktop/ChangeLog index 64b2b30ed8c6..76ab74199d3f 100644 --- a/net-misc/grdesktop/ChangeLog +++ b/net-misc/grdesktop/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/grdesktop # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/ChangeLog,v 1.10 2004/02/21 01:14:51 cyfred Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/ChangeLog,v 1.11 2004/02/22 00:17:03 cyfred Exp $ + + 22 Feb 2004; Andrew Bevitt <cyfred@gentoo.org>; grdesktop-0.22-r1.ebuild, + files/0010_all_0.22-remove-double-makefile-syntax.patch: + Fixing some more DEP/RDEP problems and adding patch to help with scrollkeeper + updates during compile. 21 Feb 2004; Andrew Bevitt <cyfred@gentoo.org>; grdesktop-0.22.ebuild: Pulling bad dependency ebuild diff --git a/net-misc/grdesktop/Manifest b/net-misc/grdesktop/Manifest index f67e0a3d5f3a..6582cc899b83 100644 --- a/net-misc/grdesktop/Manifest +++ b/net-misc/grdesktop/Manifest @@ -1,9 +1,10 @@ -MD5 27089d6e9449a4f6d4e80c95964d1d7b grdesktop-0.22-r1.ebuild 907 +MD5 692fd2707f933bf07e0cd494bb84df31 grdesktop-0.22-r1.ebuild 1107 MD5 f487f525f420bf853e942533fc512076 grdesktop-0.17.ebuild 881 MD5 cf051036d64a6954a388518e526383ed grdesktop-0.19.ebuild 807 MD5 cdda3d895cff9b0f6838259015cfe3ac grdesktop-0.16.ebuild 882 MD5 7abf09a008c487edc92c2f08b984436f ChangeLog 1468 MD5 3028bfd8385ff166be48a323b5316d50 metadata.xml 220 +MD5 c2269043464e0708e27a660f20f2ce66 files/0010_all_0.22-remove-double-makefile-syntax.patch 850 MD5 01661549d947b7edab52e75c03476c52 files/digest-grdesktop-0.22-r1 66 MD5 8f5279603001dc6bdb032bb9e3a7376f files/digest-grdesktop-0.16 66 MD5 bd45cda03c751d4e58d0b798d28822c6 files/digest-grdesktop-0.17 66 diff --git a/net-misc/grdesktop/files/0010_all_0.22-remove-double-makefile-syntax.patch b/net-misc/grdesktop/files/0010_all_0.22-remove-double-makefile-syntax.patch new file mode 100644 index 000000000000..80db80afe006 --- /dev/null +++ b/net-misc/grdesktop/files/0010_all_0.22-remove-double-makefile-syntax.patch @@ -0,0 +1,25 @@ +--- help/C/Makefile.old 2004-02-22 11:07:30.758697592 +1100 ++++ help/C/Makefile 2004-02-22 11:07:43.102821000 +1100 +@@ -368,22 +368,6 @@ + done + -rmdir $(DESTDIR)$(docdir) + +-omf_timestamp: $(omffile) +- -for file in $(omffile); do \ +- scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \ +- done +- -for file in $(extraomf); do \ +- scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \ +- done +- touch omf_timestamp +- +-install-data-hook-omf: +- $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) +- for file in $(extraomf); do \ +- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ +- done +- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) +- + dist-hook: app-dist-hook + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/net-misc/grdesktop/grdesktop-0.22-r1.ebuild b/net-misc/grdesktop/grdesktop-0.22-r1.ebuild index 7b27c8707504..f8115084994b 100644 --- a/net-misc/grdesktop/grdesktop-0.22-r1.ebuild +++ b/net-misc/grdesktop/grdesktop-0.22-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.22-r1.ebuild,v 1.1 2004/02/21 01:13:11 cyfred Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.22-r1.ebuild,v 1.2 2004/02/22 00:17:04 cyfred Exp $ DESCRIPTION="Gtk2 frontend for rdesktop" HOMEPAGE="http://www.nongnu.org/grdesktop" @@ -12,12 +12,14 @@ KEYWORDS="x86 ~sparc" IUSE="" -DEPEND=">=x11-libs/gtk+-2.0.6-r3 +RDEPEND=">=x11-libs/gtk+-2.0.6-r3 >=net-misc/rdesktop-1.1.0.19.9.0 - >=app-text/docbook2X-0.6.1 - >=gnome-base/libgnomeui-2.2" + >=gnome-base/libgnomeui-2.2 + >=gnome-base/gconf-2" -#RDEPEND="" +DEPEND="${RDEPEND} + doc? ( app-text/docbook2X ) + app-text/scrollkeeper" S="${WORKDIR}/${P}" @@ -26,6 +28,9 @@ src_compile() { --with-keymap-path=/usr/share/rdesktop/keymaps \ --localstatedir=${D}/var/lib || die "./configure failed" + # For some reason we have duplicate syntax in Makefiles, removing + epatch ${FILESDIR}/0010_all_0.22-remove-double-makefile-syntax.patch + emake || die } |