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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 121 insertions, 106 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/Manifest b/sci-misc/oww/Manifest
index 7575b9b213b8..0653c6a509a1 100644
--- a/sci-misc/oww/Manifest
+++ b/sci-misc/oww/Manifest
@@ -1,18 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST oww-0.82.1.tar.gz 933860 SHA256 afc2050080a87162681f43f35a548b88b05ca516a95f49c276176c37beea7a65
-DIST oww-0.83.2.tar.gz 912487 SHA256 94792f2e945b15c55efe1402b710488486125192760de99f8f64dd73cae45be8 SHA512 2801c9fe8d7aa2e34a419e6d764336f8429dbfa99337ca65f0c806004d806a6d141f570416c860fb505293d6522180763b59c0e96a24ee5abff206fa51354583 WHIRLPOOL d837ec870d099d2995c1c48cd5fab9c77576742c16ecdc7e0cd04f1fda95db8519c661dd71e25327bd6dcbabcd101cbd86a5a3b287521d5945a8cc7ab612f45c
-DIST oww-0.86.2.tar.gz 921696 SHA256 667ef8cc6567e64e508d37392765c9b9ea61fd188919d9c3098485b56b739ba6 SHA512 f4fb9cd84cd74b7e90d3a5d9da06f149a16d6c246b95e46fbb6d9102f3077c69952eb97e123f29191c49379ea9bf380a4d45dc02c0b6735596bbef36ac8ae2cc WHIRLPOOL e7837bca0d8f2261c8fa14aeb6346d168d32a5434e6c68c283556cbaddcce0e945511abb1905784520845665d58817a729a5d0357b6f5e340217a40634ad95bf
-EBUILD oww-0.82.1.ebuild 896 SHA256 2fbdf7f0890dca4be53d8a8a7ee8c6c84b2c1eb3a484efc3d539e2e5b322eba0 SHA512 8214a49f565cbd648a807027611de33362d48a3c07500206c91ad3044376ee78280331d4cadb1f862cd4f0fd9682e0d654aeae37ea94d24f869639ae59fcf4c0 WHIRLPOOL 673ad2124525e426bbb156ca1245e8483ae2e2ae431f126f3ca977bd902b284da96878888de49200901f4cc98455a003d8b7509fd3b35d218da130025f3344cb
-EBUILD oww-0.83.2.ebuild 896 SHA256 ca9ba2c681f2f5637c71e3f17f931512c40704b1943b8c97ba552d05c9b0d7db SHA512 1a203aa77eeab7d7e9002078b9e32ba78e5d968c91fbea59427baf1a43b82ea81bef131b8802511acc658701aeb5243da94ffdf95a88eb29ce86315b8f5faeb2 WHIRLPOOL b3df234e1e6dba1be8d7fc53e562e3096faf7fdf0aa73569d88f0d93403ea59eaf55a08d47109960cbf7e29689bba386b55c26f3bff74697f8e40a1f395b16cb
-EBUILD oww-0.86.2.ebuild 812 SHA256 55fa78d7dd67328da5960db798d0522633cc324c6f988e8d66fbb56fea7cb422 SHA512 436eef06b19fff5ea490267b6af7e6d2b90ba050e6dffd4ad0d7418ba803bfd4fc26391edc167af9d9a75b8f950e391994228b1c61ded555e8a54655c31464e6 WHIRLPOOL ad85419cbae8ef959ece481a6a8ddeb787b2d6142f2102cffd2f1affaae9095cf824b2f10e7ff439ff1be030440d27f19f061d32e00cc8f3a3787b3369c4e0de
-MISC ChangeLog 1576 SHA256 e8f65b79f419e0451cf5d19e1509c16fc29af3650f197e3702c11266a62b4d2a SHA512 b8e3ca62476487c1bddf124a502fdd8891daf550add2379183c36bfef55e204c314195f27a20426473e34ce2e68cef191cb129dd8b1f911a8c9c54d274df988f WHIRLPOOL 96932581fd3252a6585b70a34015d22d4da5cae16ac5965847715154bc5973f4b178509263efe844f716c4dea49b2cf6dfa7eb6b8f31d7a5f8d4b6297b1d3754
+AUX oww-0.86.4-build.patch 1953 SHA256 b1e72f5738a11bf96c6b3a41565b893177d50231ca37e5ba7b705f2ab8d57bf2 SHA512 596ae53c671f8cd94a20c1867fbf03ba06955d660d3c642b9ef6a8c825422e29c0162e4280925135c172b56329934caabd6ff4f4dcf0f8f0238ab0eae0a4f8e9 WHIRLPOOL 1025e998c549c80f11923ae31ff51a85cd95c7629054f68fffdd758a8d48b39aa5c14eda34f6a3821ec0352838ab20095d07ec801451806405846eb10ab3b17a
+DIST oww-0.86.4.tar.gz 927032 SHA256 ad8347590d29d58dfa693ee1be0bf49a08bb8d1e065dc119e7f6624303262ae0 SHA512 b97ddd164fe81848e87466992414c8382a0f681bd8f1e16fc51a43facb73f073eb6b0c1da858f4d2d1ffc09273b05b6c3b526a1ccf1d572dbbfd3bfcd0742e05 WHIRLPOOL 82f3a61f25fcfe2e30fed4550b8d647010ab2a5c7ba8083341f3fee8157968a647df0361b08bfc55c76d7c150a249b53aba4dc886621eda0c7a64b3b24516968
+EBUILD oww-0.86.4.ebuild 795 SHA256 97e0c0c6bbdeb929190ce0a26bef69ae3fddf4e6f5e4217552fbf72b5f9416a3 SHA512 8748226c507e3aca8ef3b17e085b385a573616972829f1ea2e0c52cca04f7c507b8a54d1aaa95bd5ee3f176bdacfeca2ffd3293db117959dceb9f25d51e21f15 WHIRLPOOL 2a820f30e86d2efa086639afecfdd62dd39541ac09cb615732313862832a9142b1ea9c051e27a8e06a965a20eddc926a26e65cf23803f5a07a998ca0413b6fab
+MISC ChangeLog 1804 SHA256 a04469f938975bed921634bce7d0f3c393b7b1078caedadc55fd3ab8da1c9a01 SHA512 e7c0b697729770e487efdfc2199af0394efd72651369502a16712afd6eeda7092fa6ac329b3ef87af95a6267e19f2d79fc56ff083a14efbd6ca42bf0b0bbe3d9 WHIRLPOOL 3242b6f7961959f6187fbaa89fc4bbafa9923dfa49e4ada94c8bce404c41693c84df3f68af097fcd4bf5257c2e1ade59184eaa9122ba83ab304c13b441dcb06d
 MISC metadata.xml 158 SHA256 dae7918daac89b300804812d32584889aa1c4e8b9edeced06006900494457a6d SHA512 e4901a5df84502b46aa85ec01804ce680332cebe6148e4a9c8201a38935ee0d4a753bcdb3f18765b06019926a05bf099c0ed61395aa98211610ab7fdb8d7f895 WHIRLPOOL 2f12466ef66cc7b89ec428cd4b498b20f12ca6dbb219f180ac12985dfc4195882ea95809797828a720fe69a0e560d12de9c271f8aacaa06fba09c9c1ccd589e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlE/HQkACgkQgAnW8HDreRah0gCfWWhrYsxDODOcEBAWHoJ/nVQw
-rQAAnR7YrKFxn1arkSt3n9ShXGpl0XNz
-=s8zc
+iQIcBAEBCgAGBQJSVBa3AAoJELnU8jG9FVirSXMP/iMeVyHSSM0QrXTGQp5QXsZM
+Lsz+pAyo+DCNaYoc3TumIC5jHFEm7fr0jl/12HrTR9xtBJqLbBxxCcvSX2e5Hzrs
+2J9Ip0IpmcPrM56VJbcHOBojzVQ1OT5VLE5qqrY6i1Q9LI5wAJ+Jhu175YnWd581
+HNtXjHRpDtqMRPrevHms528+P55qpJCGMqwG4m3djBXI0/E0GWtHNR3EjHk2N/qL
+YHa1As2bjaHbouJlLFbkZm6Ys57iHIB5EX0BGjBUrpNTd6OqInC3/or281Rruk5Y
+NL4FGd6tXsHSxz8cYR5t94GbxMxzGr78G4ns4cZ+OdqELo4YgES0UWskwk52jbvv
+pOvaIIVdSWcqwuqdsCQzStKd+y5lbOJaLzGBvGRtPEoRrRbPx5Nd1D4qjYqwemMl
+ZuRZVr0QGfM3rYUvm9XDS+Tbccjov0s4k0gd5PamTnlnzeuY0+idQhiYcRPra7eY
+tfzYrK4Ibe99oME64Q+jo8OxQDn+X1iYuOwbTDevyAlQqKFAt9ww+1CpaPOaFinS
+W2zBnx7K6zy9aJ+TC8rZi+LaIVJ01r0/9cfNBKgPM+ezYz6bWZMhQyN8ZTjLdhzs
+PD7rDB/Mb1BVFEa8vWmMJ3hf26gns51WTj5W179SWY8aXZQLutB5b99JxFt5sfmL
++MQXnTneruYg6JmO9s9o
+=CZSu
 -----END PGP SIGNATURE-----
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
 }