QA: do not pass unrecognized configure options

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 33 insertions, 27 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 2a959338be0d..c7082d9753b5 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/xournal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.21 2011/11/16 22:55:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.22 2011/11/16 23:40:03 dilfridge Exp $
+
+  17 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  xournal-0.4.5_p20111022.ebuild, xournal-0.4.5_p20111022-r1.ebuild:
+  QA: do not pass unrecognized configure options
 
 *xournal-0.4.5_p20111022-r1 (16 Nov 2011)
 
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 27c52eab9de9..ad8960456934 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -9,24 +9,24 @@ DIST xournal-0.4.5.tar.gz 425062 RMD160 a4228e6874482bd381c59cd8e3db1100361c1d40
 DIST xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz 21551 RMD160 6048a996fdb7b43e05beff67cf5ae0da53cff840 SHA1 0ff950726a7ad5b0012421c158406d6d49d2c38d SHA256 88b050483fc27f37f307adb358b3e5c4bfc0b600b7d3427599dea4c1ffe87fc2
 DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86ffc046dfbe SHA1 69f66e1125ba3de3deea14be1eb6d7e8f07abe61 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f
 EBUILD xournal-0.4.5-r2.ebuild 1294 RMD160 d123c46f65d0c25e1c134d0e99c15f2f6503f6e5 SHA1 1c50cdbc98773a000e87ad8eee2d720513d21040 SHA256 6e9e1dd61017407aa6c734c15510a98de913f2a5637e0210e3a9b9f9da8cc38a
-EBUILD xournal-0.4.5_p20111022-r1.ebuild 1332 RMD160 cdc8602913b2ff53684fbfb9514877a04635217f SHA1 b2eb2cd57e9e5c93e519dde0f6d2e3d96d579fa0 SHA256 25a17977318203b2f8d86c08d899427505df28e3ae232b3b478d18dbed7759e4
-EBUILD xournal-0.4.5_p20111022.ebuild 1252 RMD160 fd9af62f9c4f22e9ff26d27b8fd3a65e9fdc449f SHA1 188fe5124bce80003eaa179f93b4f523d7ea7729 SHA256 5be5460466e207ff9a2b192827ba811f499190fe6191925a2814ccb97a9e82c2
-MISC ChangeLog 3887 RMD160 42e0106716abbef3d3b1478d254ac70758a7d884 SHA1 7f5e4ed5a3ae0dced10f79f20ef447ddcb742bcb SHA256 d7780da18b66f7c0b3c1a7ea740e03bbe77944171bbbf4917d64ef44eda8607f
+EBUILD xournal-0.4.5_p20111022-r1.ebuild 1321 RMD160 31252719040e714e34557a5e14e25eed79512167 SHA1 9210f8bacd3085570f31e837fdb3b1da7b056a9f SHA256 7b761e9875cfd7bd419d7478732486d3b64e32ac6a25f0be1744dca11dd53f09
+EBUILD xournal-0.4.5_p20111022.ebuild 1241 RMD160 606beb7acafb132df3bbde42d44de1ce02d43670 SHA1 28c2e6b9da040775c36990f3ad96f552cf5fb265 SHA256 d7d205a1ddf2aec7622ceabf54e565a156e2a46a25cb056fc8c548cb53ccafb8
+MISC ChangeLog 4063 RMD160 44c430558b1d55ff9b93935918c4c74953789e60 SHA1 73ea96f9b5e65ccc57be51a6e0bbf809066aa665 SHA256 26ca4e0d537cb4d27c5dc4c75296965bf2ab17c8f3af88fc651bdbc265940a16
 MISC metadata.xml 653 RMD160 f0e7b38b207db6082a6b845ceb8b293668e52bb4 SHA1 f6aac8c9078d20955f92e08ffaa8e2b1c737e7c8 SHA256 a44dc37c1edd247b527b1d5658c0a48e14c56eceab7156611f9bd224c416fbf5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOxE2+AAoJENwGBM22xffeqcUP/2onxBjQonJoW5szvMCFnWgp
-7ONeN5afk77OrUfLfhy0Zqegc5dxHBsjpTF4CdUHMBGK9mjVCxvZwzTzOA/hZEkY
-241BNR5o7/hyHCyw3Kw502QpjoAA9YD9ESmmPav7JxI+0shIKrk6ANFzqAGJ59KS
-xr1cimxEJUpi5D1u8x7tYobc3yyt3gZ+CdUqs5aQh7E56ByQWO0TYP+CczzDVN4J
-pFTQS9B7XyRyYOzMm10MRFrwCMtfg9a003HRS7QHCV5vk5EzYAtkXt1GKKsnWI7r
-T4DoId9jRfrEUi4CY09Ex7byaZFroWpCGOqGTOTZwkQYZeQ0tCF4kYi913T30tBU
-K9OA++yLKCTVYjBySRteaVaR/WtAloKSW0y7SfS/1rdtWkDIoZRX8MiegsyA+02T
-eyL5HkCeMUeEjmyvn1Fv4jIIyx6X1aTO/j/UfVUKT90Gcs/lLCJ4IV8s8q8FJ2E5
-0tofDyQhyRGxt38qTslHBv0r+LCirHysughZ6m/LdzE7K0nTIlWQ0tSp2y0E4iCW
-zYOBymIeFJibx6tAt8TC544fTfrEveMJDwdW7zuaF2QlTK9iT2jgW2nnRrBwKTRT
-Fu01O9qgq8T/4Y5UD3FP7b+Wga9PvN92LJGj7MQyjGkJvsR8x7x0amNJszzMogcx
-PsxHzDRMmLzHbcrkjo0m
-=SB3H
+iQIcBAEBCgAGBQJOxFgcAAoJENwGBM22xffealEP/3b3fBr2/aRK0EkE7SgiEPwv
+O60et9jeR6sB/Sb+LeCfjZf/JMXkjt7SDN954limBptX5XwjrhdEUolGZ8jPq0UL
+tneDNBn/I5sfFG4RVO40qhIeMkx2dRHrGn5QoG2Nuv9sCyevfLPM+xKC55xRcsW+
+apD9hK+SibsSs/EXyGv2eEJbNLWQx12F/dHjTQgdfooIdpQUWaZ57ujnGSWqLR27
+6Ap85OpqudXhdSVoRThaMx3nmVWZSH1GlRXAi6QBV/AbMWJP6Y+b3JXs76s41dDo
+xt7ER/Nbwl3kv3/V2ZyB3WDrIkR/ZqvTRB+v6nJgZiN0fXI3jVt+VLmddNtAAygP
+sS/02aJAoZxci0RsVG7OofIOQEvtTqCBAERpZyOWu9vr0hMGnPvSDdfCTQuzXcvX
+ujsH5cAF8s+aKb0Srl79u3/9RpmoLfY9VSNrh5eWU+ZLHPo7AT1P8/P7GMB4ndxl
+e1pKRrNuloFIsNzRXonYjxnRPvu4T8dPcHf1Ja5UCwRWjybvJR9ft+oEJZ9A3eUv
+KmqyL91Z5elopumpvpgK3cnu+vr+42wUZnzeys/Mvm5aYZpq7caxnDWsyBcGFmvn
+C0rmHdenYCAAUrzM2gryLEufRRXLt8RRZco1HhNt/KT7z3zGVC1Xa9iCRL+ExLHc
+6fdeROiQgqaUZa+fital
+=dHwP
 -----END PGP SIGNATURE-----
diff --git a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild b/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
index 116ae243a3a4..de5ce8de3d80 100644
--- a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild,v 1.1 2011/11/16 22:55:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild,v 1.2 2011/11/16 23:40:03 dilfridge Exp $
 
 EAPI=4
+
+GCONF_DEBUG=no
+
 inherit base gnome2 autotools
 
 DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
@@ -13,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+pdf doc"
+IUSE="+pdf"
 
 COMMONDEPEND="
 	app-text/poppler[cairo]
@@ -51,7 +54,5 @@ src_install() {
 	emake DESTDIR="${D}" desktop-install
 
 	dodoc ChangeLog AUTHORS README
-	if use doc ; then
-		dohtml -r html-doc/*
-	fi
+	dohtml -r html-doc/*
 }
diff --git a/app-text/xournal/xournal-0.4.5_p20111022.ebuild b/app-text/xournal/xournal-0.4.5_p20111022.ebuild
index c081be572964..047642556dce 100644
--- a/app-text/xournal/xournal-0.4.5_p20111022.ebuild
+++ b/app-text/xournal/xournal-0.4.5_p20111022.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022.ebuild,v 1.1 2011/10/22 16:20:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022.ebuild,v 1.2 2011/11/16 23:40:03 dilfridge Exp $
 
 EAPI=4
+
+GCONF_DEBUG=no
+
 inherit gnome2 eutils autotools
 
 DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
@@ -13,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+pdf doc"
+IUSE="+pdf"
 
 COMMONDEPEND="
 	app-text/poppler[cairo]
@@ -45,7 +48,5 @@ src_install() {
 	emake DESTDIR="${D}" desktop-install
 
 	dodoc ChangeLog AUTHORS README
-	if use doc ; then
-		dohtml -r html-doc/*
-	fi
+	dohtml -r html-doc/*
 }