Enable multilib.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

6 files changed, 118 insertions, 20 deletions

diff --git a/x11-libs/libXpm/ChangeLog b/x11-libs/libXpm/ChangeLog
index f21d6a73e0a1..c99310e690ff 100644
--- a/x11-libs/libXpm/ChangeLog
+++ b/x11-libs/libXpm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libXpm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.87 2013/02/22 18:52:30 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/ChangeLog,v 1.88 2013/02/26 16:56:47 mgorny Exp $
+
+*libXpm-3.5.10-r1 (26 Feb 2013)
+
+  26 Feb 2013; Michał Górny <mgorny@gentoo.org> +libXpm-3.5.10-r1.ebuild:
+  Enable multilib.
 
   22 Feb 2013; Zac Medico <zmedico@gentoo.org> libXpm-3.5.10.ebuild:
   Add ~arm-linux keyword.
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index 4c14fb423ab3..741dd20f1978 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -3,14 +3,27 @@ Hash: SHA256
 
 DIST libXpm-3.5.10.tar.bz2 431310 SHA256 a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735 SHA512 27ddf49ec13e77ee89cc3dfcf95631576a941e9fab18bfa1bbe2d45e8979548793f8723ffa4d97db7fdb4909883f9efa2c7d6e2996696f82940fdd7518e2c49d WHIRLPOOL ac4871d7b3e5fe90cdd0b6f31fb00fa26dd35985027947dd116a20b5738ed290804b84d70ebcc52577235045cb1272dbe0b04512630c47b8b26b679008a78fa4
 DIST libXpm-3.5.9.tar.bz2 383818 SHA256 8add01029cab0598ca86e01a2f7781a636f74b757abe6b50ba61b2a6e2fd621e SHA512 6e0f35758caef06379f92bc5ad7b5f00a921944eccf907d859405359b3a5e3c143ab8b47547fc8d54b96801838ac048e1b050a541c44f356c69655c107d5de09 WHIRLPOOL 69651bfe7139833e69bc006c4dbeb94aff1a2cd5be652a4b70512911931a3b543ccaecf5edb9d443ac6ee75635cee21f1d8a2501f582a65598fb4347fec3d6e6
+EBUILD libXpm-3.5.10-r1.ebuild 1124 SHA256 e591f8beed80012313abd9ea6418a7b65bc0fd33beb89dbad6593f91e6d9d1de SHA512 ccd0ed1cab860fa162f00b5273ed8fa0933ef9e61b015fb438b6638a536ded382146dc54cfa5c48359d14fb2c87c72c8013ff3a14e409f2f3e4bf3f2a8695232 WHIRLPOOL 9fd09fd90da0833f77172fdcc25f259bd072629c3501e0abba530a1dfb44d6302d6740e91068dec90be188d19d326f2d86da4adb8a1a93627f620d235852deec
 EBUILD libXpm-3.5.10.ebuild 993 SHA256 15f13a3ee96f0fd05ad8c5c22e015c8a7ec49c7dd421a9d5948d0cb194cd3fb2 SHA512 3e06e257816df22b3c25a24a3b9a8fbca8497cef4fbf43eac5e48f71275e3cfe76e1aa3c5fdfdd30e2b3c8024b2ac4069bb709c6da4cd3d5a9eb6ea2969e4726 WHIRLPOOL 191f31942a29f041dca704f2b51fe3828395c961dd182f09697d1a9e2a3b35597870ffd7ea85a5a433572b9ec959245443640e7beb2c50e5c9b3c194e9c54f36
 EBUILD libXpm-3.5.9.ebuild 1005 SHA256 5887e56b4052af3bd31bdd73bd19f4a16c6ac48fbd70da351bcdfd9d23d17ad1 SHA512 646c7117a607ba295ec410ebdb833b9188eac090b4ff54c35b491c1c9e65b7415ad78bbe1595c00eef5e29d22246b4c534e64cc8c5e0d01b4754770ae4c025bf WHIRLPOOL b0b2df80ddab1e0f4c6af3b115ce591e9eae2f1ec0e80cf1ea0363fee32ed5ae004338c9eb3fae7fd21e0adecebe45dbf98bde1dbf68341a9e851a9153460ac7
-MISC ChangeLog 9355 SHA256 6308a0587c380a88294b04bde897af3deeebecc4c636fe642c47ca50530300f5 SHA512 158234691708845290736e087bd6e083a7b2476e0aacba1101d91402b97a5b645ff41a929f265a398051ca6d7c9a83b35bb3225bd55ebc6724ae9d039ffcafff WHIRLPOOL 5e46a8ff6925195d83354428a4ed59231a388d1ecff4637cc0b5ed11d92321afc9fa675b0ce44284ab85fe013376ad2c9a3bf6bb2c8975819c922e923a184eff
+MISC ChangeLog 9483 SHA256 be78753f6c28f1e198d81272d80f334804f4a22f599825655a70ed51dd96c13c SHA512 1d445348f796ac307c93c0aff44ce20001bf6d33344c615d860804d5dc59964de39f263e9a553ef690557a3e975ad554eb660244f5323a2b88ed1255fcf0f2b8 WHIRLPOOL 189a459c484fc29df298b52695ff14647b5fa68b31cea3efc394a242b02b21e61a46594cbdfbf832f9656e1bdee80835eb9a24a61a9a4739f6e1d5e9f0e36230
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEnvnAACgkQ/ejvha5XGaMPvgCeKWNjmxu4CVu2Z734nKA0TDzA
-j4IAmQHS5i5r/EZpWHlNTehNM58Ez8It
-=XXrr
+iQJ8BAEBCABmBQJRLOluXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDbtcP/R6pPZHZIU5byM9y3fOSMW75
+MgZxmCWiUwrLId0m23T8Mgj1bXNiTa+DUUt4gYksRiHu1zAqL8wRC9tBaXBPLxcv
+mnXi3ZoxewPvm/AALwhCa1qip7aUChlo+9jngKxhPjBtaUuOawyH8vHTkapK6+pD
+kKQOvRfljgeYci4IW9SFLdhqkQuBqOpdv4i4ots8RCFCYUS5uUKQcKDVSFYZ7WmY
+lA72s5Pa86ji4mZgXHelQnqEqprUmAF5RI0Nt+izswaDKVMKvMGbA0jkRFZjU1uM
+T88A+MEdWJ3RF2BxOYigb6HGc1+xIh4+dUMkpYo9DTkB0OVHk1hMSbVYM4YClYIn
+ZEZ25kUqXqQYjCnlpa/K7Au7eoo0RTDIyNHY+FglwY/ll+Eej30/MzZGHiUEi1zd
+m9hU2QMLzxhT0g40XIsrfSPw6vt3SoL3UXtD3mvOXe0Uy874UukMNsK3LKc5LnRZ
+XcM9LbexW8VgCV9KK+nZTR9jMJru79BmIqR9s7gE9GhOt78B3GYToZMGI0dsy7cp
+MKvftgKt4HxvCMHG5DoyaC/IAfE18xmXrsT9ThsGyDNOi9ZxLnarqjwsteiaMkij
+HhZxx3Wen3rTz/CokEM1wQeTqWGbYXQmNoDzRxbdKpy9lIqmLBMmdCSjAgT7EEaQ
+k2mAyneD/tZ0zlhLHY7T
+=osdV
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libXpm/libXpm-3.5.10-r1.ebuild b/x11-libs/libXpm/libXpm-3.5.10-r1.ebuild
new file mode 100644
index 000000000000..2939b2cd21ab
--- /dev/null
+++ b/x11-libs/libXpm/libXpm-3.5.10-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.10-r1.ebuild,v 1.1 2013/02/26 16:56:47 mgorny Exp $
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xpm library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${MULTILIB_USEDEP}]
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_configure() {
+	# the gettext configure check and code in sxpm are incorrect; they assume
+	# gettext being in libintl, whereas Solaris has gettext by default
+	# resulting in libintl not being added to LIBS
+	[[ ${CHOST} == *-solaris* ]] && export ac_cv_search_gettext=-lintl
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libpciaccess/ChangeLog b/x11-libs/libpciaccess/ChangeLog
index 4b44f0e4d581..a878d68d67e3 100644
--- a/x11-libs/libpciaccess/ChangeLog
+++ b/x11-libs/libpciaccess/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libpciaccess
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.85 2013/01/21 01:26:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/ChangeLog,v 1.86 2013/02/26 17:00:59 mgorny Exp $
+
+*libpciaccess-0.13.1-r1 (26 Feb 2013)
+
+  26 Feb 2013; Michał Górny <mgorny@gentoo.org> +libpciaccess-0.13.1-r1.ebuild:
+  Enable multilib.
 
   21 Jan 2013; Mike Frysinger <vapier@gentoo.org> libpciaccess-0.13.1.ebuild:
   Add s390 keywords #453114 by Sergey Popov.
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 10f5190de739..fad7b90ef44f 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -6,24 +6,27 @@ DIST libpciaccess-0.12.1.tar.bz2 326217 SHA256 cc47d7f0e48cf4eed972916b536fdc977
 DIST libpciaccess-0.13.1.tar.bz2 352351 SHA256 27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084 SHA512 2f2a78894451ce46ce35f86ca4c8fd05559a7ed840eeafb91dbc8727066239d5b3805904d68b472e00d678f05a24974491acc42f42bbb6126cb35d29f3bcbfa7 WHIRLPOOL 6da8da459fe38ccb7345131070fe15d395a8bf8c70a6011f58d5368a4be97e6b96e78d005027c9de1a62d407676706375ddcf44ee3683edbb4fef6c5cb0631dd
 DIST libpciaccess-0.13.tar.bz2 334074 SHA256 24368520b0947487ec73729e3c97c95f3d9bf83704a910bb0abe1d5a63df32fd SHA512 e808178ddb626abc33ff26fcf9673e656b42d1f5c126ffc99058868f17efb8c1fd1f791f63b2ad9df3ee6d729cfcac5c6a236e74b3444319f4706b32d29d08a0 WHIRLPOOL 28b4a583cd273aa5c2e14b3982efda9f948e5924182380f76f12548cd23ad3386b1c574466d98259df87fd9c22595c9751ecd75ae7abaf1c13fbf8e6a2cf42a1
 EBUILD libpciaccess-0.12.1.ebuild 985 SHA256 6faf47dfcc606d8f3144b7e97c7ac2184d02d7437d6091e38f666fc273c23037 SHA512 907e0ca39bcd25e947d0ed742647a07a21ba0bb6b001b045f690bc5401e6241f44c31b0cfd707c79d325aca06c00fcb422da67d391bf3f62d3f1769103e18c8d WHIRLPOOL 63bedeb8cf092b46d7b9b66a344f6a32bd23cecd6b669aed42bd2c86390800e79b0e58432130aa720054ef4aec46053a1984f1c2393c7552d5e5828f81eac3e2
+EBUILD libpciaccess-0.13.1-r1.ebuild 1162 SHA256 427d9ac64606f5c4bcdba09bc035a204fd56db4b38e82443329533b99e199bbe SHA512 d5f0704198830cd11504b4b97175f838b42cf3ee1216ab4140cbe864cf3bc3f60dd4927d97ebb8094fb10ddf3628c55f11773072ecf8803d26edb39985490c58 WHIRLPOOL 5ee44585ab289914bd79ace1b1812ab80caf200c5317c89ce115d9c3c3fd328ea5a519ecd06cf38e1dbefe83f9cfe289567e7abba01914df178b4c8188e389d2
 EBUILD libpciaccess-0.13.1.ebuild 1015 SHA256 31a772a6729dbb8f6753b9cfdfdde0074483a46940b6a2fd343004e0db439921 SHA512 502fef0d7365e254d6cb4dd142fed3c46cced0ae50cda2a65b906624314f0f43c088adb38a762806f0d724678f51d22c95d128e0f07bf124f202e4ea326db3cc WHIRLPOOL 2d8591bffa36758d00e658b67eb9d2c8ceb4943c100be8f5fe7d5354719e6223a55f5f8af5dd03dbc9cba64d82637f4228b4510f08edd598835c97666136b92f
 EBUILD libpciaccess-0.13.ebuild 1048 SHA256 84d6a612b9c8094eea7753cf6a489d15c86b286ad37737e9c2866dc50340b3b1 SHA512 8312cacb44e84c0d5571fd06ffed50cb7edc6e42ce6429c9d9d5b4c20168b3cb004b205ed43802f39e767cd3b5ae0616d82354a5384b2644db57a8eba8171e41 WHIRLPOOL 82b6eb15fcc3df079a0d4bef55fb0e617672fef60800469d1459ef1724646595f57bc1380bc20fadd5809942519a9d77e56d928d71067c51449ddf5845630c19
-MISC ChangeLog 10656 SHA256 868eaac87504170075d3e4be31dc788e455155510f4daaefe9e9d9e86b0369a6 SHA512 78eac2ef15ee04c7a38e991c320f14969c89cf30a80bd71d51690d70436a85bc9ebf24bea2524a965054336393460382ad87e2a9d6f2105390d3fbaf24d01dfc WHIRLPOOL c50d056c35722e31a80620ea1354a4f792ebfdc22377e8042f05d1587adc2fa2b7766a21cb1464e8db94a142458b0f13d6e8c3cfa5cb9492da68d5d821e08769
+MISC ChangeLog 10797 SHA256 fb598ceb6e796a16eb54ae862e2e5d156e6f48d098d49db1c0f92ba112775ac2 SHA512 1ac9ae64bb3139f9224780848bc851c26f55646dd44a4a2be03939229da73c7e3a0a9439de4f5755740174fc8141fd5252cb786eded7ea243a526980be391726 WHIRLPOOL 04c1dd78e6a6454d637067c4b95e7443a009e1d667ff7eb030ed77559ba3812279b6928ad9b208dc50eccf25519f5c37420306c792662fd892959f1f7df36d39
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ/JohAAoJELEHsLL7fEFWG/EP/ijNVKchef1YqyX6R/Y4Mdj4
-Iefq8WD5qO3QaFuhootvbTrM59cUwI4xdzw4XJn7xieKu54clFLu/M2ZweKL/iz6
-+scdskxrbhgHnCETYcNTSAniiSR3M7NOlhFD0jzVGO3g3uNIynSDH5r7vfrBxtGM
-udwrNDi2M+cQLhgmdbR3sdyZJCnMNgH4R18flAzxBPR0Uw+QGGxELHyqDv4G0q6+
-+YAiC3LtzS1T1cOUAEDeNp78Ku3ZJcdv8uhA63ynMW467UGUTr04XxV4CP/i5aUj
-e7Xvy2d7KMw1XXyMamGqXOjaLbcr6Pf+l39lYZts+Yz1hqTtA509KNVBjJbQc/0p
-qG1BjlrGXPVzc6ri3Fiqm4KLo/VHDuCeXsKx9GTRNcmKnrR6+65C+AnIEtGS5bV8
-bkwa4dBntQ4hMSffRKTQY9+U49Kciofgw5yMNq1lXGAE1//WsUJjGwxA5ufKwQYT
-2arNI9sIqfNUkfn2bB4FMRc9qQgfHfnYpp7NV8fIzxadgQxTL48IWjTUKO+WF/MY
-pQ7csHvyrrg51jeag8S75V6i97lS5QiPrYX+jedLyYZWRqwrZNqPYyfH8XZmTr5Z
-Ym99aw+e2hNVAojUxa2+RJY2F9E6RsFtRA12ENuveo+ZxC2fAHo8w/5jGzDfboLt
-5JjnY+n0Hrnmm3rj4Vtc
-=If2I
+iQJ8BAEBCABmBQJRLOpmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDj6QP/RLfjevZ9AIQFMsYj6CxhfrU
+s/eUBUGQPELPNE92h9JAhkvql58lyOJJKoqk7OZHwwXJGbrXfi08gYsSLocYcp2z
+qEMfORhcrzTKO6lrcigOlGP7Dyl24SB4+KhH2hW0D/zndZCi6EBv/5jP11QeU8X5
+QLRT8SRv0o4lYr+2pPp+QYCktcQFClpnIclM6QDz3yMFZbwtG6vW2BURoNhypfVq
+neuo9nNvtqBX3no6Sk3d3ICGLjA4UWYMSel1DDFBWODmmk7D6yyWULft9K/s59mt
+Nnc6t/crFnLTxkg7xrAZ1T3O2TahfuuGC7SPGcJhIPGf1fb5Aw93tAbtZ4t0l7ST
+TDBjpGvpdB6N8wiHun8A6Uuse5VbtfzWKmphR/+nvUiyrCdMXVnGXCWJ04geJXMo
+GttVt8YH/UoB7wwa/l+lMgKXrUdmdh4sz4htIncIvsKcEENhzsZiHa7uQIWEf8vT
+aqsiA2ElpWxZEtbRe8LRfaicRrGFxnSwLwq+617TgFfcE1eWovFkcctrJcuK5opA
+OhuPrFK5GCpBye22USfQFx6lg2K4DlKQ2rGvU1FQJQANTLX5yd3IR7IDgKKs5l0J
+IofAFcPcGokrjgvNuWfB3emjSJ1JKpE0Go6aOKpkdUFrErCgl/TEjVbOA4Zizur3
+R8qAvLWEcBwTTEcToslh
+=JKe2
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.1-r1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.1-r1.ebuild
new file mode 100644
index 000000000000..578e66c6ab54
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.1-r1.ebuild,v 1.1 2013/02/26 17:00:59 mgorny Exp $
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="Library providing generic access to the PCI bus and devices"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal zlib"
+
+DEPEND="!<x11-base/xorg-server-1.5
+	zlib? (
+		sys-libs/zlib
+		amd64? ( abi_x86_32? (
+			app-emulation/emul-linux-x86-baselibs[development] ) )
+	)"
+RDEPEND="${DEPEND}
+	sys-apps/hwids"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		"$(use_with zlib)"
+		"--with-pciids-path=${EPREFIX}/usr/share/misc"
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	if ! use minimal; then
+		scanpci_install() {
+			${BASH} "${BUILD_DIR}/libtool" --mode=install "$(type -P install)" -c "${BUILD_DIR}/scanpci/scanpci" "${ED}"/usr/bin || die
+		}
+
+		dodir /usr/bin
+		multilib_foreach_abi scanpci_install
+	fi
+}