Fixed for and marked ~m68k-mint, bug #498100, use force for odd dependency parse error in non-changed ebuilds

Package-Manager: portage-2.2.8-prefix/cvs/Darwin i386
RepoMan-Options: --force
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 31 insertions, 23 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index bf24cd8ae39d..fdf09954ce71 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.580 2014/01/15 09:56:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.581 2014/01/16 20:55:38 grobian Exp $
+
+  16 Jan 2014; Fabian Groffen <grobian@gentoo.org> cups-1.7.1.ebuild,
+  cups-9999.ebuild:
+  Fixed for and marked ~m68k-mint, bug #498100
 
   15 Jan 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.6.4.ebuild:
   Stable for ia64, wrt bug #489914
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 6b71e411b014..8baacc6fd359 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -17,24 +17,14 @@ DIST cups-1.7.1-source.tar.bz2 8738002 SHA256 f52bec893d9daf92b6029be79c07e6c516
 EBUILD cups-1.6.2-r5.ebuild 8950 SHA256 62b61bdb510ed6be19602a1be3a5f7f38de0930706076eaaab13d534b77538b0 SHA512 82896c9597e929ce23b0abbf1b093f981fc00896f663b129de34a403548a9eb9b2ef6f11c55840dc154719e44676ade9b2c265f35218e7f105a49115fe486ff5 WHIRLPOOL 834ebf4dab854b84bd90ed749a2d0f0af8a5d9425f3f9afd77f0538784830258c1e02af8592fcb43767e46d6587d30171edab99f65b3644827277a8cca422f3c
 EBUILD cups-1.6.4.ebuild 9036 SHA256 741a68ee87fd4335cc9ebff2f11b233c0d0347b8a72b7749c175ae7bc0944ef1 SHA512 77721d52b9faacedf963e2ccd1e40bce9c243c092351875bf7a712c8f5049aef67e9deba27cef43c514257e4d0c746f16c9714b6b44de6104babcdeff8f3442d WHIRLPOOL 63a9eeee6df48dd576b650815be87405d8a6d1774bf4783fec549aad12c20849ed6f39734cb557c699c6c8b5fbce1aa0f3be828344f46471fabde493d2707de5
 EBUILD cups-1.7.0-r1.ebuild 9056 SHA256 300074d4c67084036fd2ee1d3b559a9edbe308691991121a3301c28d8e7d8bf6 SHA512 7314c8c42f0111fee15b18a8ed82314fc93fb724c66d82bfaf261308f35e5cc6d5942cbd8677b25932016a00720472bb8f498146122fe4f2ae72e03392766b70 WHIRLPOOL 55026c2d63dd8ef45f63f2cd31cbb1259d3e1fc5e7c0aaeecb0dbacf2b6e27f5e2b25342fbad575f016e11b10095f137561bf177704989df1d697fb17be6dd94
-EBUILD cups-1.7.1.ebuild 9125 SHA256 578c0a9c27f0128673bdc6fbfa58b545811a0653dd3f07fb0fdbbad33cf50881 SHA512 970c209b2d8663b6cebfb469efa3624e519395211d9abb4cbb984b58fbb13b1ea65ac0406fcc94529ccbdea8ca52dcc898a5b56e66c228191f742e7a133bf987 WHIRLPOOL fbfa57c92b126ccdb90b1b7bfef13c33626bb3b72f4d006cf73106afbf73369d5c74640b07898326b73febfedb10553fd997c2488b8131832d21005d82eeacfa
-EBUILD cups-9999.ebuild 9125 SHA256 7ab665ec0c76899bc8807316131baf6b620dc3512398a55bce6e95e85da1b8be SHA512 42ab847adf4b35c412fa0b03f8e3384661fcf5f60b96192517bd93f9724f5671ee633d25d3ac870f51bc857cad3d6dc96811b81f91f249c9401484e90e906e72 WHIRLPOOL 81129cbf9891058ef207284e6f7d4f225478a9d2da5e45a1746907d3709c5fca9f6b19ecbc025c8f9399a0a854e46182235735406b6c405240717757099042a0
-MISC ChangeLog 88284 SHA256 4e9d494c4b4637d900f76c2f32b397b057cfa143f648b5dfc7bc1a6efdbc5ef7 SHA512 d66a83b713ad01a68e41c579b33ce9fce60c210bc53eda6ecec47e0c19f7962afb41ee9c1834561628c433b9ab1d5e4bb62ea8bbd1c0de70d80fb7a0acf4b2fd WHIRLPOOL 13b2aba70de4b0ea0b8027df656381035275e0bf6ac41df346b78e20ca07be8c2b636db0a4ce046381af87594f7f09e2c8a0e73766138d0996de682e3c510b33
+EBUILD cups-1.7.1.ebuild 9223 SHA256 0a3730bbe6d28645ca25ce612245c8731908c34d0824f1ae1327d86e3cb0ce3a SHA512 72168ab54d35d68970461a5f84fd6d1796946389d07fff50fed6e6e82ef03955ac20a6a8b383ada889f2bf5260aa9fbe0df118bf82a16429c8c3f8d8d4c84236 WHIRLPOOL b0f54f178c9580326e45172278f762dd6a9d70d66000c88c513f951a68e00fd816a504b377dc0c30d6792969e7dc9d72fe5c83f170b7fcf7b8130c47fa4ed9a9
+EBUILD cups-9999.ebuild 9212 SHA256 839a8a47ea8ba8fc5bec40c9daec5ff46160376b9f089f4beddb628a8e5378ff SHA512 e29bac2e7a86e0280b1aa9aa01c4a5d7f9f4e966d7c3a13c9d73b4eabe45899a99114c8ab045ccd149a7526d2baafba468cbb8ccd6f642ddbe5ef57f7661109b WHIRLPOOL f0503cf3c382919b3d163de42b911bc9f6cda065c729747f1cf6f282949afc254ae702901b1d5dde4173e7ea1f4ab60e3dbcc3c64685dfdc14f19454e14f4ce9
+MISC ChangeLog 88426 SHA256 cd45af40c847145aa258207db06182381218fcd68037e67bfbd8783d828fbaf7 SHA512 883ca57beec16da88f9d5494bfa3e7c9c1606e9a2f057058725beebacaf5170c3b5a85e247cdedb2da1ef372e49d01022d8cdb05894639076121b63a2683ec55 WHIRLPOOL 5a8ac6c8dff918b4240b7d1401f14b7a38bba91756669bdceedf30a86136e2c2e3cccb55fb7bf853ceb983df8d1b6bb2f3571d3b00a770c028d211b739cd4d8b
 MISC metadata.xml 601 SHA256 9bcf6942c89c7dd963f9a34c413c1da17e25cd36489b95b708d4a89ff9659ea8 SHA512 58f0fe7d1f7b66a637013eeddb26a5c409d46915c8f4220e54850cf17cfa0cb082b3c2c5055a660857729cb4c5a53c7ac229dab6a29f801e53dae0ddc94cb573 WHIRLPOOL 55660efe3345c304742dbb12947776a97ebec51354fbab55423dd1fa7efa1b3d9321f067dfcc469462911e12446892b223ebbd3b670d1126255ffe642a64a527
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.22 (Darwin)
 
-iQIcBAEBCAAGBQJS1ltfAAoJELp701BxlEWfrHIQALziKlgxs1rpTCf/1JFfiE4y
-iQ2XRrOqoGw06YV9Gg06p3am/uAg+ejuQ0WSQK0+2UELfr20wFNMoMlTdFHmcHV9
-/qMZpvdFKc5/5FetuS6ut405Mkk1Zfq+aep2nJhL7/Qz+hh+KV+FhqRCIdXGIytc
-0lcZBa+xQoV025CTEf+al5iWixMjypskclBCa9orOzfpGj9xgkxVbwwBwBcMSjQ9
-OTo5gWF7TT4LwTexGIPDErwJYzgmqOIAYongcAXkAetYscuw2A/h/A+42ZssTJQ0
-v3df9XJMIgWwieTcftt9jzYIJaaH4zPQuhIhBIYE5fn/eSr8ttxjTk15IG8V5DVf
-yZ0gEbT9K3GDbdcAZJGvwnDrrE5dS6Xdf2Gwi6Cs9fd+L5g3cmwmrTsIs2spioNW
-Se9/QjBBcLWeiF5jO+qrMJtQ+Le1s7cu7+KxWQ7J8eJe7v1YKToD4LjO6wCcm9T9
-Z76JBOMRN3VvkeJ7bfc0PvJ1g+wdeWx3JsP8u7c1971WDc0n/6DtD/VaW9OQ1A9/
-aQc5gQ4zCkeMK92FOye4Q+reUBkRR031zOBk3WWubElTaJvZSZKmZJZyODFHqibJ
-EjS081mKofYEXUSUBq7ragucF80o6hIyanXWwWflyJwe9sJ+zgAoraF7QM9+eO+u
-hH340u0gr47CedL/ifkP
-=zq88
+iEYEAREIAAYFAlLYR0sACgkQX3X2B8XHTokKIACeOgbVERaseQ/kTykGonFk+ZIm
+/RUAnixV5AuOaaix5gyyz9l4c695Ec7q
+=BjYG
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.1.ebuild b/net-print/cups/cups-1.7.1.ebuild
index 3969e6cdb041..f5226c1ee669 100644
--- a/net-print/cups/cups-1.7.1.ebuild
+++ b/net-print/cups/cups-1.7.1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1.ebuild,v 1.1 2014/01/12 17:41:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1.ebuild,v 1.2 2014/01/16 20:55:38 grobian Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
-	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
+	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd \
+	toolchain-funcs
 
 MY_P=${P/_rc/rc}
 MY_P=${MY_P/_beta/b}
@@ -23,7 +24,7 @@ if [[ ${PV} == *9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
@@ -161,6 +162,12 @@ src_configure() {
 		"
 	fi
 
+	if tc-is-static-only; then 
+		myconf+="
+			--disable-shared
+		"
+	fi
+
 	econf \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--localstatedir="${EPREFIX}"/var \
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 3f4ba8f2be5c..9241b170d954 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.47 2014/01/12 17:41:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.48 2014/01/16 20:55:38 grobian Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
-	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
+	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd \
+	toolchain-funcs
 
 MY_P=${P/_rc/rc}
 MY_P=${MY_P/_beta/b}
@@ -161,6 +162,12 @@ src_configure() {
 		"
 	fi
 
+	if tc-is-static-only; then 
+		myconf+="
+			--disable-shared
+		"
+	fi
+
 	econf \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--localstatedir="${EPREFIX}"/var \