fix locale behavior, add missing PYTHON_USEDEP to dependencies, remove unsupported python2_5, remove obsolete PYTHON_MODNAME variable, update license

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 86 insertions, 45 deletions

diff --git a/x11-misc/arandr/ChangeLog b/x11-misc/arandr/ChangeLog
index ced059ec32f8..1710ee028633 100644
--- a/x11-misc/arandr/ChangeLog
+++ b/x11-misc/arandr/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/arandr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/arandr/ChangeLog,v 1.10 2013/03/01 18:13:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/arandr/ChangeLog,v 1.11 2013/03/03 00:25:13 hasufell Exp $
+
+*arandr-0.1.7-r1 (03 Mar 2013)
+
+  03 Mar 2013; Julian Ospald <hasufell@gentoo.org> -arandr-0.1.7.ebuild,
+  +arandr-0.1.7-r1.ebuild, +files/arandr-0.1.7-locale.patch:
+  fix locale behavior, add missing PYTHON_USEDEP to dependencies, remove
+  unsupported python2_5, remove obsolete PYTHON_MODNAME variable, update
+  license
 
   01 Mar 2013; Jeroen Roovers <jer@gentoo.org> arandr-0.1.7.ebuild:
   Port to distutils-r1.
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index 699ccf9c85ad..fd16a4080df3 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1,16 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX arandr-0.1.7-locale.patch 1020 SHA256 ea5e1325e93c797f14ea3eeb07e003df8a65b9c1d2bd6a336416bc843b1933d2 SHA512 c592471ff2e751a57b1d626300801f6c96493f2e3d4bea5f927dcf0f7a2897ce2eaf3c578f48f9316b94076a90949eaa08ccd1f691fbba061d6643543dec2079 WHIRLPOOL 699e6e1c076c7b6e4e3d5e17ee2d6d67469897f9ff22d947ea0ae40c161881265dad5dec20fdaf5fcfcf3cacf7c74730fb252ad49f14806902965a80b6fa8411
 DIST arandr-0.1.6.tar.gz 76064 SHA256 252bbeab69dae3c8e2176883e09ccfa8b4309905964bc8a2aab26cec2b33743f SHA512 4dc98d7c8a9ec05e5040e6c29f99aa991b79444c583fbc38ad8b2a11844f748f021ed7cd93754809230c28bc9af21bea841754c09dc80cce7198efb0cb0b56c4 WHIRLPOOL 789904c233decb272a93c99e36b977ee3ede99291b913317afda29c4c901b07b5b9c1167a45cdbe4e0ac63dbc0555be71295430e75ac9ac532c608dfc7aecd41
 DIST arandr-0.1.7.tar.gz 81386 SHA256 99de611220dab67f488735bd5b52ceabbddce0606e0cfd8ff80151be91fb7f43 SHA512 bb35ef99e11a37dd4567caf0abbacbc490df181719cb052ab0d15ea25c44e5f51d1a82ea6d6d81c1d5588cb1effba188ab7ccbd82a27acc07772ca632ac9701e WHIRLPOOL e7a2253971bcc4e3740871a03be8899e63a76c6791c576cea014cc18e28b320c005951c3856731fc6b271328e98a6866d18d42f20783bdd9a3cca049f7d62689
 EBUILD arandr-0.1.6.ebuild 669 SHA256 a652a8895b18eb5819b575ed86464e427e5874059cd7f57374fac7f1dcfd2467 SHA512 8dde0205d0697508814ce1951f5f8ff023cd2be07d1970cbfb57529e121ec2cbee08387138b3427907a1c231c54fd75c84acfaa2f0c94cc40e608f7c0ae729fa WHIRLPOOL 9311f558af795932eefbb63843ea385627abd27d37e23fbc3ae5fb2c6a231f0c6a26b27c464b5b08bf2d8228131a13b4612d17223d982874f62e805436b997d0
-EBUILD arandr-0.1.7.ebuild 966 SHA256 f2f94b5f5a3a3eb560478464ab0a19cad6f34950c8c8b718d6271bfad035bd3d SHA512 db25c81e2e671947fdd9bfa5ee299a82ea95f497f86f3e64fec7e52582f6ba53fc88f90ed18e046a32af3755d78d7fd9a39b5d7a359d6435b94cc81504085cad WHIRLPOOL 7b45ccbd354d12ab3ef3b28a7c0834eeb3b4814304d34088c6192910e4b738c8c0f68a9be1f3675a8a58a71552e8bcdef1fcb22a2a08fef77f73c2a0bccb5b74
-MISC ChangeLog 1572 SHA256 7822da9607072309a6c0178239860db6db5eaf817bc0e3ebaa82fe844aebbb74 SHA512 61cebd70d35c673fd53d32914fca321490d71461a2ec2773a9d16565053c6b63314c76895817c64d86ad91480012f49cfec46d0eb2031b27fa2942b187534c01 WHIRLPOOL 1c558aff4b94d49ea8160559906e06c52555fee583b7e92558a4905057981acba85848947778e22d6cd9d22d43497f416ee0f18c83e78ed32ead29fb67f4e79a
+EBUILD arandr-0.1.7-r1.ebuild 1159 SHA256 0b2edd0b22c02d784871ab5b1b5660225e9ddb25c47353c1636362463cd66eb7 SHA512 ab1ae174700d72aadf511d81cb836c934f233a37523303c0be1757a0e1a7f277751dc6a9700d0ecb37286a23da3ae65099c8ed11560f9e1f4ea5895c06a87046 WHIRLPOOL f22c364f5089b7753f0692e096fa4b08f09f2bce9d8e2a433ab15bf56cf415614fba6814335b531cc69158b89ea2ceee69e89703c7fac5f42405d2d5e503e7ef
+MISC ChangeLog 1900 SHA256 83ffdbeb632d82ed4afe19756c1493d9224b146820073d41bc3e126783d6d474 SHA512 ec8ae0d9a3aba3a25a52eca71b3300dc604664a566b79369d64bc2e0866e5e721b7067a47801659c835515242183d1c5b037edaee08a5905202b89dcbeb04208 WHIRLPOOL f25ccc8bc6ca7362803a0146095f41aaddcfaa168b18edeca1968c3058ecfe8ead95bd36c091d2a46cbf263782c8bf6448c400e123fba07a678c8407eaaa3345
 MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEw7+EACgkQVWmRsqeSphPtuwCfdW+WUFb5x8l4foTR+vhSch6J
-/MkAnjWN+a0YaumS34lv3X9DyNcxUDdG
-=wQeJ
+iQEcBAEBCAAGBQJRMphqAAoJEFpvPKfnPDWzaaIH/1SCPyhjroFtcL5PNCZ1JAQP
+cn3J0kaCFAGCnnkDlkN0FWdq0GDz7sV0U6do5uamBQsXrdEw1FjBnbzybqZXZrRq
+EVH9Y1fli/4aOm2GEVZj2fypsM4OmTHhf5ykHz2L+sQpwJcVmL2hvrgZQq5HBskP
+nQhrLjJJ7tCJuBP6guHYu94+TgsJL0ItrPdAjBJwa/BrCU62i5+a2mEVBqlz9fAE
+jotvgqGCKRJ0CcqldqEOzTtMTPyZ+oYb+pifM2mjgyTKhK2zrWXE7/l71cLwRzzV
+Y7KKzQ/7N+q5gL2/o8cSUa+ZOSUwrzSvGIg2NM4mkrJFL5wxFzVIY6UJVcZeO/U=
+=/xzu
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/arandr/arandr-0.1.7-r1.ebuild b/x11-misc/arandr/arandr-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..30b3f8c7d765
--- /dev/null
+++ b/x11-misc/arandr/arandr-0.1.7-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/arandr/arandr-0.1.7-r1.ebuild,v 1.1 2013/03/03 00:25:13 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A simple visual frontend for XRandR 1.2/1.3"
+HOMEPAGE="http://christian.amsuess.com/tools/arandr/"
+SRC_URI="http://christian.amsuess.com/tools/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pygtk-2[${PYTHON_USEDEP}]
+	x11-apps/xrandr"
+DEPEND=">=dev-python/docutils-0.6[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-locale.patch
+
+	local i p
+	# simulate gettext behavior:
+	#  LINGUAS unset => install all
+	#  LINGUAS="" => install none
+	#  LINGUAS="de fr" => install de and fr
+	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
+		for i in $(cd "${S}"/data/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
+			if ! has ${i} ${LINGUAS} ; then # if language is disabled
+				rm data/po/${i}.po || die
+			fi
+		done
+	fi
+	distutils-r1_src_prepare
+}
diff --git a/x11-misc/arandr/arandr-0.1.7.ebuild b/x11-misc/arandr/arandr-0.1.7.ebuild
deleted file mode 100644
index eb245f34b03c..000000000000
--- a/x11-misc/arandr/arandr-0.1.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/arandr/arandr-0.1.7.ebuild,v 1.2 2013/03/01 18:13:51 jer Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-inherit distutils-r1
-
-DESCRIPTION="A simple visual frontend for XRandR 1.2/1.3"
-HOMEPAGE="http://christian.amsuess.com/tools/arandr/"
-SRC_URI="http://christian.amsuess.com/tools/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ARANDR_LINGUAS=(
-	ar br bs ca da de el es fa fr gl hu it ja kn ko_KR lt nl pl pt_BR ro ru sk
-	sv tr uk zh_CN
-)
-
-IUSE+=" ${ARANDR_LINGUAS[@]/#/linguas_}"
-
-RDEPEND=">=dev-python/pygtk-2
-	x11-apps/xrandr"
-DEPEND=">=dev-python/docutils-0.6"
-
-PYTHON_MODNAME=screenlayout
-
-src_prepare() {
-	local lingua
-	for lingua in ${ARANDR_LINGUAS[@]}; do
-		if ! use linguas_${lingua}; then
-			rm data/po/${lingua}.po || die
-		fi
-	done
-	distutils-r1_src_prepare
-}
diff --git a/x11-misc/arandr/files/arandr-0.1.7-locale.patch b/x11-misc/arandr/files/arandr-0.1.7-locale.patch
new file mode 100644
index 000000000000..9954f4ea7f57
--- /dev/null
+++ b/x11-misc/arandr/files/arandr-0.1.7-locale.patch
@@ -0,0 +1,27 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Mar  3 00:09:56 UTC 2013
+Subject: build system
+
+don't error out when build/locale is non-existent
+
+--- arandr-0.1.7/setup.py
++++ arandr-0.1.7/setup.py
+@@ -120,12 +120,13 @@
+ 
+ class install_data(_install_data):
+     def run(self):
+-        for lang in os.listdir('build/locale/'):
+-            lang_dir = os.path.join('share', 'locale', lang, 'LC_MESSAGES')
+-            lang_file = os.path.join('build', 'locale', lang, 'LC_MESSAGES', 'arandr.mo')
+-            self.data_files.append((lang_dir, [lang_file]))
++        if (os.path.exists('build/locale/')):
++            for lang in os.listdir('build/locale/'):
++                lang_dir = os.path.join('share', 'locale', lang, 'LC_MESSAGES')
++                lang_file = os.path.join('build', 'locale', lang, 'LC_MESSAGES', 'arandr.mo')
++                self.data_files.append((lang_dir, [lang_file]))
+ 
+-        _install_data.run(self)
++            _install_data.run(self)
+ 
+ class sdist(_sdist):
+     def run(self):