sci-misc/oww: Drop old and version bump, #487278

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 102 insertions, 94 deletions

diff --git a/sci-misc/oww/ChangeLog b/sci-misc/oww/ChangeLog
index ba0eb3633693..c3d9a073792a 100644
--- a/sci-misc/oww/ChangeLog
+++ b/sci-misc/oww/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-misc/oww
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/oww/ChangeLog,v 1.9 2013/03/12 12:18:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/oww/ChangeLog,v 1.10 2013/10/08 14:29:10 jlec Exp $
+
+*oww-0.86.4 (08 Oct 2013)
+
+  08 Oct 2013; Justin Lecher <jlec@gentoo.org> -oww-0.82.1.ebuild,
+  -oww-0.83.2.ebuild, -oww-0.86.2.ebuild, +oww-0.86.4.ebuild,
+  +files/oww-0.86.4-build.patch:
+  Drop old and version bump, #487278
 
 *oww-0.86.2 (12 Mar 2013)
 
diff --git a/sci-misc/oww/files/oww-0.86.4-build.patch b/sci-misc/oww/files/oww-0.86.4-build.patch
new file mode 100644
index 000000000000..19f96a0c8551
--- /dev/null
+++ b/sci-misc/oww/files/oww-0.86.4-build.patch
@@ -0,0 +1,79 @@
+ Makefile.am     |  3 +--
+ configure.in    | 15 ++++++++-------
+ src/Makefile.am |  2 +-
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index f90cc9d..36495a7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,10 +5,9 @@
+ 
+ SUBDIRS = src pixmaps po
+ 
+-owwdocdir = ${prefix}/doc/oww
++owwdocdir = ${docdir}
+ owwdoc_DATA = \
+ 	README\
+-	COPYING\
+ 	AUTHORS\
+ 	ChangeLog\
+ 	INSTALL\
+diff --git a/configure.in b/configure.in
+index dbc694e..a9c779f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -6,6 +6,8 @@ AM_INIT_AUTOMAKE
+ 
+ AM_CONFIG_HEADER(config.h)
+ 
++AC_CONFIG_MACRO_DIR([.])
++
+ AC_ISC_POSIX
+ dnl CFLAGS=""
+ AC_SUBST(CFLAGS)
+@@ -134,17 +136,16 @@ else
+ AC_MSG_WARN(interactive CLI will not be build)
+ fi
+ 
+-AC_ARG_ENABLE(gui, , build_gui=no, build_gui=yes)
+-AM_CONDITIONAL(DISABLEGUI, test "x$build_gui" = "xno")
++AC_ARG_ENABLE([gui],AS_HELP_STRING([--disable-gui], [Do not build gtk gui]))
+ 
+-if test "$build_gui" = yes ;  then
++AM_CONDITIONAL([DISABLEGUI], [test "x$enable_gui" != "xyes"])
++
++AS_IF([test "x$enable_gui" != "xno"], [
+   AC_MSG_WARN(building gui)
+   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0 gdk-2.0 gdk-pixbuf-2.0 gmodule-export-2.0,,exit)
+   AC_SUBST(GTK_LIBS)
+   AC_SUBST(GTK_CFLAGS)
+-else
+-	AC_MSG_WARN(skipping GTK gui)
+-fi
++])
+ 
+ dnl How many times do we retry T on failure?
+ AC_ARG_ENABLE(temptries,
+@@ -319,7 +320,7 @@ cat<<EOF
+ ------------------------------
+ Oww version $VERSION by Simon Melhuish (simon@melhuish.info)
+ 
+-	build_gui = $build_gui
++	build_gui = $xgui
+ 	interactive = $interactive
+ 	seriallock = $seriallock 
+ 	USB support = $usb_msg
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e0f6746..c02aab5 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ # Needs USB_CFLAGS here else things like musbllnk compile will fail if usb.h
+ # isn't in the compilers standard include path.
+-INCLUDES = \
++AM_CPPFLAGS = \
+ 	 $(USB_CFLAGS)\
+ 	$(GTK_CFLAGS)
+ 
diff --git a/sci-misc/oww/oww-0.82.1.ebuild b/sci-misc/oww/oww-0.82.1.ebuild
deleted file mode 100644
index 537420a41a10..000000000000
--- a/sci-misc/oww/oww-0.82.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/oww/oww-0.82.1.ebuild,v 1.3 2012/05/04 07:50:52 jdhore Exp $
-
-EAPI="3"
-DESCRIPTION="A one-wire weather station for Dallas Semiconductor"
-HOMEPAGE="http://oww.sourceforge.net/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-IUSE="gtk nls usb"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	net-misc/curl
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "s:doc/oww:share/doc/${PF}/:" \
-		-e '/COPYING\\/d' \
-		-e '/INSTALL\\/d' \
-		Makefile.in || die "Failed to fix doc install path"
-}
-
-src_configure() {
-	econf \
-		--enable-interactive \
-		$(use_enable nls) \
-		$(use_enable gtk gui) \
-		$(use_with usb)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/sci-misc/oww/oww-0.83.2.ebuild b/sci-misc/oww/oww-0.83.2.ebuild
deleted file mode 100644
index 1cd56245e3e6..000000000000
--- a/sci-misc/oww/oww-0.83.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/oww/oww-0.83.2.ebuild,v 1.2 2012/05/04 07:50:52 jdhore Exp $
-
-EAPI="3"
-
-DESCRIPTION="A one-wire weather station for Dallas Semiconductor"
-HOMEPAGE="http://oww.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-IUSE="gtk nls usb"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	net-misc/curl
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "s:doc/oww:share/doc/${PF}/:" \
-		-e '/COPYING\\/d' \
-		-e '/INSTALL\\/d' \
-		Makefile.in || die "Failed to fix doc install path"
-}
-
-src_configure() {
-	econf \
-		--enable-interactive \
-		$(use_enable nls) \
-		$(use_enable gtk gui) \
-		$(use_with usb)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/sci-misc/oww/oww-0.86.2.ebuild b/sci-misc/oww/oww-0.86.4.ebuild
index a216cfdbc18f..5848e46c5b24 100644
--- a/sci-misc/oww/oww-0.86.2.ebuild
+++ b/sci-misc/oww/oww-0.86.4.ebuild
@@ -1,9 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/oww/oww-0.86.2.ebuild,v 1.1 2013/03/12 12:18:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/oww/oww-0.86.4.ebuild,v 1.1 2013/10/08 14:29:10 jlec Exp $
 
 EAPI=5
 
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
 DESCRIPTION="A one-wire weather station for Dallas Semiconductor"
 HOMEPAGE="http://oww.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -15,22 +19,20 @@ IUSE="gtk nls usb"
 
 RDEPEND="
 	net-misc/curl
-	x11-libs/gtk+:2"
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	sed -i \
-		-e "s:doc/oww:share/doc/${PF}/:" \
-		-e '/COPYING\\/d' \
-		-e '/INSTALL\\/d' \
-		Makefile.in || die "Failed to fix doc install path"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	)
 
 src_configure() {
-	econf \
-		--enable-interactive \
-		$(use_enable nls) \
-		$(use_enable gtk gui) \
+	local myeconfargs=(
+		--enable-interactive
+		$(use_enable nls)
+		$(use_enable gtk gui)
 		$(use_with usb)
+	)
+	autotools-utils_src_configure
 }