Fixed bug #39317 & 39342 and fixed copyright headers in all aria ebuilds and fixed the nls useflah so it actually works.

7 files changed, 85 insertions, 8 deletions

diff --git a/net-misc/aria/ChangeLog b/net-misc/aria/ChangeLog
index b6df3b9c7ed4..7218cf0fdef2 100644
--- a/net-misc/aria/ChangeLog
+++ b/net-misc/aria/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/aria
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/ChangeLog,v 1.9 2003/05/15 20:47:36 jhhudso Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/ChangeLog,v 1.10 2004/02/09 06:39:48 jhhudso Exp $
+
+
+  09 Feb 2004; root <root@gentoo.org> aria-0.10.0.ebuild,
+  aria-0.10.2_beta7.ebuild, aria-1.0.0.ebuild, metadata.xml,
+  files/aria-1.0.0-savefiles-gentoo.diff,
+  files/aria-1.0.0-xgettext-gentoo.diff:
+  Fixed bug #39317 and #39342 and updated the copyright headers on the other
+  ebuilds. The first bug was that aria would not start without some specific
+  startup files in your homedir; they are now provided and setup automatically.
+  The second bug was that aria would not compile because it could not create
+  internationalization file aria.po. I also fixed the NLS useflag so it
+  actually does something now.
 
 *aria-1.0.0.ebuild (15 May 2003)
 
diff --git a/net-misc/aria/aria-0.10.0.ebuild b/net-misc/aria/aria-0.10.0.ebuild
index 60af981b94d8..ccbfde596cdf 100644
--- a/net-misc/aria/aria-0.10.0.ebuild
+++ b/net-misc/aria/aria-0.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-0.10.0.ebuild,v 1.8 2003/09/05 22:01:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-0.10.0.ebuild,v 1.9 2004/02/09 06:39:48 jhhudso Exp $
 
 IUSE="nls"
 
diff --git a/net-misc/aria/aria-0.10.2_beta7.ebuild b/net-misc/aria/aria-0.10.2_beta7.ebuild
index 5b17ef30affb..a34aad82fe76 100644
--- a/net-misc/aria/aria-0.10.2_beta7.ebuild
+++ b/net-misc/aria/aria-0.10.2_beta7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-0.10.2_beta7.ebuild,v 1.5 2003/09/05 22:01:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-0.10.2_beta7.ebuild,v 1.6 2004/02/09 06:39:48 jhhudso Exp $
 
 IUSE="nls"
 
diff --git a/net-misc/aria/aria-1.0.0.ebuild b/net-misc/aria/aria-1.0.0.ebuild
index 914da49a1ddb..870d9f23fe57 100644
--- a/net-misc/aria/aria-1.0.0.ebuild
+++ b/net-misc/aria/aria-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-1.0.0.ebuild,v 1.1 2003/05/15 20:47:36 jhhudso Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/aria/aria-1.0.0.ebuild,v 1.2 2004/02/09 06:39:48 jhhudso Exp $
 
 DESCRIPTION="Aria is a download manager with a GTK+ GUI, it downloads files from the Internet via HTTP/HTTPS or FTP."
 HOMEPAGE="http://aria.rednoah.com"
@@ -16,8 +16,27 @@ DEPEND="nls? ( sys-devel/gettext dev-util/intltool )
 
 S=${WORKDIR}/${P}
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/aria-1.0.0-xgettext-gentoo.diff
+	epatch ${FILESDIR}/aria-1.0.0-savefiles-gentoo.diff
+}
+
+src_compile() {
+	econf `use_enable nls` || die "econf failed"
+
+	# This fixes an infinite loop bug
+	touch Makefile
+
+	emake || die "emake failed"
+}
+
 src_install() {
 	einstall || die
 
 	dodoc AUTHORS README* NEWS ChangeLog TODO COPYING
+	touch ${D}/usr/share/aria/ftp_proxy.aria
+	touch ${D}/usr/share/aria/gui.aria
+	touch ${D}/usr/share/aria/history.aria
+	touch ${D}/usr/share/aria/http_proxy.aria
 }
diff --git a/net-misc/aria/files/aria-1.0.0-savefiles-gentoo.diff b/net-misc/aria/files/aria-1.0.0-savefiles-gentoo.diff
new file mode 100644
index 000000000000..7710d2ec4700
--- /dev/null
+++ b/net-misc/aria/files/aria-1.0.0-savefiles-gentoo.diff
@@ -0,0 +1,16 @@
+diff -ur aria-1.0.0.orig/src/initrc.cc aria-1.0.0/src/initrc.cc
+--- aria-1.0.0.orig/src/initrc.cc	2001-10-12 11:47:39.000000000 -0500
++++ aria-1.0.0/src/initrc.cc	2004-02-08 23:52:05.509678456 -0600
+@@ -76,7 +76,11 @@
+   if(!copy_file(datadir+"/aria/rc.aria", rcdir+"/rc.aria") ||
+      !copy_file(datadir+"/aria/command.aria", savedir+"/command.aria") ||
+      !copy_file(datadir+"/aria/server.aria", savedir+"/server.aria") ||
+-     !copy_file(datadir+"/aria/useragent.aria", savedir+"/useragent.aria")) {
++     !copy_file(datadir+"/aria/useragent.aria", savedir+"/useragent.aria") ||
++     !copy_file(datadir+"/aria/gui.aria", savedir+"/gui.aria") ||
++     !copy_file(datadir+"/aria/http_proxy.aria", savedir+"/http_proxy.aria") ||
++     !copy_file(datadir+"/aria/ftp_proxy.aria", savedir+"/ftp_proxy.aria") ||       
++     !copy_file(datadir+"/aria/history.aria", savedir+"/history.aria")) {
+     cerr << _("Error occurred in resource file copy: ") << strerror(errno) << endl;
+     return false;
+   }
diff --git a/net-misc/aria/files/aria-1.0.0-xgettext-gentoo.diff b/net-misc/aria/files/aria-1.0.0-xgettext-gentoo.diff
new file mode 100644
index 000000000000..8743309666f0
--- /dev/null
+++ b/net-misc/aria/files/aria-1.0.0-xgettext-gentoo.diff
@@ -0,0 +1,22 @@
+diff -ur aria-1.0.0.orig/po/Makefile.in.in aria-1.0.0/po/Makefile.in.in
+--- aria-1.0.0.orig/po/Makefile.in.in	2000-10-11 02:30:42.000000000 -0500
++++ aria-1.0.0/po/Makefile.in.in	2004-02-08 23:25:11.299075768 -0600
+@@ -84,6 +84,7 @@
+ 
+ $(srcdir)/$(PACKAGE).pot: $(POTFILES)
+ 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
++	  --from-code=ISO-8859-1 \
+ 	  --add-comments --keyword=_ --keyword=N_ \
+ 	  --files-from=$(srcdir)/POTFILES.in \
+ 	&& test ! -f $(PACKAGE).po \
+diff -ur aria-1.0.0.orig/po/Makfile aria-1.0.0/po/Makfile
+--- aria-1.0.0.orig/po/Makfile	2002-12-18 09:40:55.000000000 -0600
++++ aria-1.0.0/po/Makfile	2004-02-08 23:25:56.980131192 -0600
+@@ -124,6 +124,7 @@
+ 
+ $(srcdir)/$(PACKAGE).pot: $(POTFILES)
+ 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
++	  --from-code=ISO-8859-1 \
+ 	  --add-comments --keyword=_ --keyword=N_ \
+ 	  --files-from=$(srcdir)/POTFILES.in \
+ 	&& test ! -f $(PACKAGE).po \
diff --git a/net-misc/aria/metadata.xml b/net-misc/aria/metadata.xml
new file mode 100644
index 000000000000..c5d67a611520
--- /dev/null
+++ b/net-misc/aria/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>jhhudso@gentoo.org</email>
+</maintainer>
+</pkgmetadata>