Respect AR, bug #462968 by ago and iamnr3, drop old

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 42 insertions, 36 deletions

diff --git a/app-office/dia2code/ChangeLog b/app-office/dia2code/ChangeLog
index a7f6cc7a08e8..607926725c5f 100644
--- a/app-office/dia2code/ChangeLog
+++ b/app-office/dia2code/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/dia2code
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/ChangeLog,v 1.31 2013/04/01 18:23:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/ChangeLog,v 1.32 2013/09/22 11:28:46 pacho Exp $
+
+  22 Sep 2013; Pacho Ramos <pacho@gentoo.org> +files/dia2code-0.8.5-ar.patch,
+  -dia2code-0.8.4.ebuild, dia2code-0.8.5.ebuild:
+  Respect AR, bug #462968 by ago and iamnr3, drop old
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> dia2code-0.8.5.ebuild:
   Stable for sparc, wrt bug #458984
diff --git a/app-office/dia2code/dia2code-0.8.4.ebuild b/app-office/dia2code/dia2code-0.8.4.ebuild
deleted file mode 100644
index 59727f90ac24..000000000000
--- a/app-office/dia2code/dia2code-0.8.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/dia2code-0.8.4.ebuild,v 1.5 2012/10/28 15:23:11 armin76 Exp $
-
-EAPI=4
-
-inherit flag-o-matic autotools
-
-DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours."
-HOMEPAGE="http://dia2code.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2"
-RDEPEND="${DEPEND}
-	>=app-office/dia-0.90.0"
-
-src_prepare() {
-	eautoreconf # Needed to prevent maintainer-mode to get activated
-}
-
-src_install() {
-	default
-	doman dia2code.1
-}
diff --git a/app-office/dia2code/dia2code-0.8.5.ebuild b/app-office/dia2code/dia2code-0.8.5.ebuild
index 60249def4fc4..8e5b610e0cf8 100644
--- a/app-office/dia2code/dia2code-0.8.5.ebuild
+++ b/app-office/dia2code/dia2code-0.8.5.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/dia2code-0.8.5.ebuild,v 1.6 2013/04/01 18:23:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia2code/dia2code-0.8.5.ebuild,v 1.7 2013/09/22 11:28:46 pacho Exp $
 
-EAPI=4
-inherit flag-o-matic autotools
+EAPI=5
+GCONF_DEBUG="no"
 
-DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours."
+inherit autotools eutils flag-o-matic gnome2
+
+DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours"
 HOMEPAGE="http://dia2code.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -16,13 +18,18 @@ IUSE=""
 
 DEPEND="dev-libs/libxml2"
 RDEPEND="${DEPEND}
-	>=app-office/dia-0.90.0"
+	>=app-office/dia-0.90.0
+"
 
 src_prepare() {
+	# Respect AR, bug #462968
+	epatch "${FILESDIR}/${PN}-0.8.5-ar.patch"
+
 	eautoreconf # Needed to prevent maintainer-mode to get activated
+	gnome2_src_prepare
 }
 
 src_install() {
-	default
+	gnome2_src_install
 	doman dia2code.1
 }
diff --git a/app-office/dia2code/files/dia2code-0.8.5-ar.patch b/app-office/dia2code/files/dia2code-0.8.5-ar.patch
new file mode 100644
index 000000000000..308b2fc8169f
--- /dev/null
+++ b/app-office/dia2code/files/dia2code-0.8.5-ar.patch
@@ -0,0 +1,24 @@
+--- configure.in	2012-07-07 15:52:28.000000000 +0200
++++ configure.in	2013-05-31 21:56:05.155859911 +0200
+@@ -8,6 +8,10 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AN_MAKEVAR([AR], [AC_PROG_AR])
++AN_PROGRAM([ar], [AC_PROG_AR])
++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
++AC_PROG_AR
+ dnl Checks for libraries.
+ 
+ AC_PATH_PROG(XML_CONFIG, xml2-config, no)
+--- dia2code/Makefile.in	2007-01-06 18:34:14.000000000 +0100
++++ dia2code/Makefile.in	2013-05-31 21:56:46.765920940 +0200
+@@ -208,7 +208,7 @@
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+-AR = ar
++AR = @AR@
+ 
+ clean-noinstLIBRARIES:
+ 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)