From: Jeroen Roovers <jer@gentoo.org>
Date: Thu, 12 Mar 2015 19:41:27 +0000 (+0000)
Subject: Fix examples install location. Fix LICENSE.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0c92b10fbf13abc6dc66ee0a24d81e31fe1f95b1;p=gentoo.git

Fix examples install location. Fix LICENSE.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
---

diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index 915908b12209..a580cc2f440d 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/bmon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.59 2015/02/19 19:16:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.60 2015/03/12 19:41:26 jer Exp $
+
+*bmon-3.6-r1 (12 Mar 2015)
+
+  12 Mar 2015; Jeroen Roovers <jer@gentoo.org> -bmon-3.6.ebuild,
+  +bmon-3.6-r1.ebuild, +files/bmon-3.6-docdir-examples.patch:
+  Fix examples install location. Fix LICENSE.
 
 *bmon-3.6 (19 Feb 2015)
 
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index e2b14aca56c2..99d316a6cd7a 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX bmon-3.6-docdir-examples.patch 235 SHA256 edca507e8736edc26ec82f67557e59568ea565fb17a5b50b90117b0d723356f0 SHA512 2b74637c6dacfa03e680774787d8287ae084ba426a3e0e178b74f1468179916509ee5de2e0c93f7abe04356d0146ad6dd8e191d9a66718ec8eaf50cb6126afc8 WHIRLPOOL c1e8b690df7949df26fed1db267234c019408eaf6a0c58d82560bde7e2e2630d551a68d114c914c6cdf7800cab69c4e2faecdf2739214dca721fa43ea99ca9a5
 DIST bmon-3.2.tar.gz 55660 SHA256 1608aa8c5a55763c216d80069e0ef3afbcf0f5349acca34f7d5ece0551b231ea SHA512 a5017a8924f8ac5eaf9f671a8494302081050aab14f629f863eecccd01ea1f4a223b3f8ce4deb4304d5904dd99acca92e973ba503167d3805641d88ddbb938ce WHIRLPOOL 362f38610ccb1bf0943f3d56d0f95b88febada0e90729f0021c1265b259765df922281a2e173561366c36135969d209e48c950f66bc3116404e77a1f3afd2593
 DIST bmon-3.6.tar.gz 57883 SHA256 7d9d9b5af751cb61e267b43309506f03e82636282742fce89209f2378ae6a4b1 SHA512 e0c3d828d5391511ea52b1058a22f5eea250c5221664a7c05d7c36fabc361905dcc6cb97184ba0f366e4fe710e33816f72ad59a5856b90265a6b1a415de319e7 WHIRLPOOL d6eaf1b94f6a3dc7d16afe03146a2f8c67514c5fd9cf2956a89f5da6730d329e474b98d6cf3f6138e19e3e1d063aa4b69f325f478b63f8d4bb6fb6b708d13570
 EBUILD bmon-3.2.ebuild 940 SHA256 d0a1ea1f62a43abd612de6a0a0312d430456280d772790219b14e9e8d5825dbf SHA512 69e876e9025ed0bb95842508dd48559d7f0a8cee469279ff283b0c33c288922e0521cb8be62a2e71afaf09e603b820cbbc17781f939e7dd8333b40bed2ece6a4 WHIRLPOOL 84f75ebaad0413d58955bb056d8e175206aa1dcdc3a3b6983f4e2852f48aef6969d78b454b840f1b8d8740e3f5ff890b74d6f5456b3a7147d3c104c2ec3b7be5
-EBUILD bmon-3.6.ebuild 936 SHA256 e846d9938872c04c8c6cc9ee42cf9503d3279ce0912e158fae17b62c4cd728a2 SHA512 f1776acb775f089c3127c6cfae3c67eda83042630f2925b849aeba849ebc1ed630238142b55140a1dd2eeaa36e46bfdee029daad9e33427bb99ead03401bb1e8 WHIRLPOOL 67002b6e07fd92bb8478f19a894c818088dd4d6685e10498b89325104c1f0085b1dd0caeb76b87ed751a8f186041ef6859c20630adfc2d00d4133854f74271d4
-MISC ChangeLog 7745 SHA256 8268d9bfac4efc713b1f940dcafdc35d9a73049586ba9c51746a918de9df2605 SHA512 ffa9fbe80128f99bb8dfac2de7e85222a0f2d3e778e8be19929e399a4a2615377465983cf95df09cf3e5967efae07213b0a56788a4a1d8117bf8af80bde7324a WHIRLPOOL 06048a560d03507488dd3f8e622834657fa7f473005a5f9274d6caec8b51a98af7c6acf1358dd8a340973977dad2b91deaa9f00f1d35ab454f8add0880ee3002
+EBUILD bmon-3.6-r1.ebuild 1030 SHA256 cd38da783a61418a17a0d382948cf1bd3c63dad7315cc1705a51266e14748d6a SHA512 519bbeda444ae305a11c651316602902a868f21fc136e626185d430b984045e54669cc2cf384c8bca0506e3baefc2d0143105bd2480919a51b03d43abff27be4 WHIRLPOOL b52bbe95d213132db3256017ee983d76eceda86fe84f77f5137b3a06b2aeb3432add7fb7d076ce59ec5b8ab30180838b573ed34f3acfaef8dda0986ca25d3d6f
+MISC ChangeLog 7947 SHA256 fdff1946678d69432fa704fdb7398ce3060e95c52be256443c047e01ee854d1e SHA512 81171c987f5ec7e0676af4223a738b993918f646355c00624514204091a1438533c0ea931263832e987f33892a355325f4809ad5dfb02885252ad497715a13b8 WHIRLPOOL 52623ad45948c58c870dbe372c5d33b8c1eea2ebfb1acbbd80c0baf775b3d423b406c3bccc405997d4522fe19adb63a9ebdea5d4c47cd4cd3036f3336aaf83c8
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTmNoUACgkQVWmRsqeSphMRcQCfZYd9g9fjESsSNtu80vGhTD3/
-esQAmwYSA4DBi1CxBa4WSBSOyVgPwaWL
-=xWz7
+iEYEAREIAAYFAlUB6+cACgkQVWmRsqeSphOzbQCeKnwaKgc8ldCnqzcFqtEnr3mV
+JM4An3hVIiKOh+KvnII5Nag+irv26CDr
+=RAZU
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/bmon/bmon-3.6.ebuild b/net-analyzer/bmon/bmon-3.6-r1.ebuild
similarity index 74%
rename from net-analyzer/bmon/bmon-3.6.ebuild
rename to net-analyzer/bmon/bmon-3.6-r1.ebuild
index 73e40d8a5e5a..6caefe0270e3 100644
--- a/net-analyzer/bmon/bmon-3.6.ebuild
+++ b/net-analyzer/bmon/bmon-3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-3.6.ebuild,v 1.1 2015/02/19 19:16:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-3.6-r1.ebuild,v 1.1 2015/03/12 19:41:26 jer Exp $
 
 EAPI=5
 inherit autotools eutils linux-info toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="
 	https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz
 "
 
-LICENSE="MIT"
+LICENSE="BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
@@ -34,11 +34,13 @@ ERROR_NET_SCHED="
 "
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-docdir-examples.patch
 	epatch_user
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+		CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
+		--docdir="/usr/share/doc/${PF}"
 }
diff --git a/net-analyzer/bmon/files/bmon-3.6-docdir-examples.patch b/net-analyzer/bmon/files/bmon-3.6-docdir-examples.patch
new file mode 100644
index 000000000000..bb7d969cedde
--- /dev/null
+++ b/net-analyzer/bmon/files/bmon-3.6-docdir-examples.patch
@@ -0,0 +1,10 @@
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -1,6 +1,6 @@
+ # -*- Makefile -*-
+ 
+-exampledir = $(datarootdir)/doc/@PACKAGE@/examples
++exampledir = $(docdir)/examples
+ example_DATA = bmon.conf
+ 
+ EXTRA_DIST = $(example_DATA)