Revision bump: migrate to python-single-r1 eclass, wrt bug #531620, thanks to Aaron...

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

diff --git a/x11-misc/magick-rotation/ChangeLog b/x11-misc/magick-rotation/ChangeLog
index 6b7171699c33854c384f8326d1d08c0be0c6ba3f..a79547a2a14a0d9fecf72e5e6e9ecd7cad278b8a 100644 (file)
--- a/x11-misc/magick-rotation/ChangeLog
+++ b/x11-misc/magick-rotation/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-misc/magick-rotation
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/magick-rotation/ChangeLog,v 1.3 2013/01/24 09:07:22 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/magick-rotation/ChangeLog,v 1.4 2015/01/14 05:35:54 pinkbyte Exp $
+
+*magick-rotation-1.6.2-r1 (14 Jan 2015)
+
+  14 Jan 2015; Sergey Popov <pinkbyte@gentoo.org>
+  -magick-rotation-1.6.2.ebuild, +magick-rotation-1.6.2-r1.ebuild:
+  Revision bump: migrate to python-single-r1 eclass, wrt bug #531620, thanks to
+  Aaron Bauman <bauman.aaron AT gmail.com>. Add missing dependencies on
+  dev-python/pygtk and x11-libs/libXrandr. Require python interpreter with XML
+  support. Add support for user patches via epatch_user. Use udev eclass to
+  install rules in proper location. Drop old revision
 
   24 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> magick-rotation-1.6.2.ebuild:
   Restrict tests, cause there are no tests in package and default src_test

diff --git a/x11-misc/magick-rotation/Manifest b/x11-misc/magick-rotation/Manifest
index f5c5bff35785c926e571f98ac3ffebd191a72a34..149290a05920c63c5bf0ebc6f0be9bb89ab66ad2 100644 (file)
--- a/x11-misc/magick-rotation/Manifest
+++ b/x11-misc/magick-rotation/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST magick-rotation-1.6.2.tar.bz2 103389 SHA256 e0decb8ffb6bd5b8ffd0f01df345f23041abe78cda97fbe7065772260a1a2520 SHA512 40252c4b57d304244f8f7a8b08448cb498efd9044406235f2d728a89c8b4888009c4e7a9f50cbb61b5620336eedf1abb1591e68e94a57b051f4d823acbcdff5f WHIRLPOOL 3aeea34a2a7cbf966a7c0ea3bd13810e2a7a2015bc1f068566ce0515636bcb661e728af6682eea80b39624a3947a8219b9144a296f7c7fe9526d952d21cab49f
-EBUILD magick-rotation-1.6.2.ebuild 2537 SHA256 0c8edc6776e04b1af3735b9acb0bf93ec33f2b7e8da2c5ce1593878c1c956fab SHA512 e57f55ab443cbc6eee95ed4b93b9d6b617c19359f0decfc08f11fcaebf60da9744b6a2fac693fa111b93ecf649c06c866238425afe56d76228be124a72d3c71b WHIRLPOOL 0ec3acc167eca5be9ff36c406e9d9f0fe9f886504e598613df09f9025d8df83d595d0fb3469350ca981309f269ac18216684418a626eeb28e086476bfa08412a
-MISC ChangeLog 868 SHA256 5a302da718d755b3ae98bdc954cb45d99aed850ea9fb7e1d397f53272a06fbbc SHA512 0be0f249275a9855ab94d55341e1cc28076264488f16d46778f4f33d2f890f53c76421ddbc2aecbfe4d559489e34c3d64f09439351406164e444abf611fdada8 WHIRLPOOL 05fec795ee4f2423984b59e291c769477a5e628d328b0311192282544cb13e5bd276ffe69e431899de549a53a71f976c9a30b297978007d334dfbaabbec51a92
+EBUILD magick-rotation-1.6.2-r1.ebuild 2585 SHA256 f2d0c1d771348386735741c90ea6b69a4e097bd7690431d1bffe1117d3587218 SHA512 5286344bb2971b85fce3f4194cf0cc9e188640ee97349c1f30ee5c747b6ce97ed3899a6a41b91e74ae51d40711a195c819436c96ed0d892d8f85f73a81fb8229 WHIRLPOOL db9f2b9c50ff443807526f5681c889a7b4fe2b3e25e45743af82c773123fdf2f45421e4595aaa0e4b980df7e63fba8dcb6e31ad088a6abf804198f1a113ef79c
+MISC ChangeLog 1388 SHA256 dd74bfd84c8b4bde91fccf43d96702681c734722a81ed44a64ce6b3763975434 SHA512 e2a0a57aa6ceca268cdd57694a7601d58172c035ed2d7b828bf36f61a86013df9da7736158e0149454f2903bde3feeaf8045390dc57d85330b1ed97e362c3aa2 WHIRLPOOL 3c9871f7672ec226e53783302de400dea278964d19c0496ac1463241172fc22ea3040999ebb64f376df9ca2f809890c14d7be00fa91a46c2b17f2038c8a23596
 MISC metadata.xml 478 SHA256 80bfcaf0d1647e99eb55925a790279fc385df16148d25c8e4b8b1770593ca34d SHA512 197c1d0b0190c9af8a4d5b39cf46a4b42ec4df851b4bcc07abef2adf02196b452addef1cf2f12eec42b84742f9113727b754cefebf283887aeeb562cb5b9b9c1 WHIRLPOOL 7e18d32ff9b2316a14e40e12a21abc85c09042f55903fd64293477238a9bc8e9c3c7ec4fecc8da9c54f9cc6d1a52935960277676424fca5995c0e192d4665f4e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJUtgA7AAoJECo/aRed9267UdMH/2dHzmqOVlD5EkktzMV2a9nw
+Ovq+VlwJWgrK3rqzq2kHVnLM1lHSxikYFissHnvB53+1KquGWcdw6lcpNCX665MU
+hvGNZbw5aaoD0/u2GY4sYTfkdnA7c6trgd+2UFqYaEz7NWTgT7T4NqvDYZCAOIYe
+Uw84TbukEN3OVzv+/fHfup+mesTOYRk+3pXPxHsySebHJtIE/u8dzWxeXditmAt5
+bH2mc/VSt59gymFR4DsQ19lsjfg/08R4g1Lwv4Txs9IRMbj5FB30rxTQKgKBRHIi
+NhJLYVYXH+WNDYQn78aYhQhmcj92PiUgG0xzoXFVNclqoNcZBxEr2Gfpg208Sik=
+=ijeK
+-----END PGP SIGNATURE-----

diff --git a/x11-misc/magick-rotation/magick-rotation-1.6.2.ebuild b/x11-misc/magick-rotation/magick-rotation-1.6.2-r1.ebuild
similarity index 65%
rename from x11-misc/magick-rotation/magick-rotation-1.6.2.ebuild
rename to x11-misc/magick-rotation/magick-rotation-1.6.2-r1.ebuild
index 59382d8a208ceff824f6c7f9ecd6efd52fc5a158..69480ec6bf3bd5cc6c767d571572d86beaee2b0e 100644 (file)
--- a/x11-misc/magick-rotation/magick-rotation-1.6.2.ebuild
+++ b/x11-misc/magick-rotation/magick-rotation-1.6.2-r1.ebuild
@@ -1,63 +1,71 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/magick-rotation/magick-rotation-1.6.2.ebuild,v 1.3 2013/01/24 09:07:22 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/magick-rotation/magick-rotation-1.6.2-r1.ebuild,v 1.1 2015/01/14 05:35:54 pinkbyte Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
-
-inherit eutils python toolchain-funcs user versionator
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit eutils python-single-r1 toolchain-funcs udev user versionator
 
 MY_PV=$(get_version_component_range 1-2)
 
-DESCRIPTION="application that rotate tablet pc's screen automatically, depending on orientation"
+DESCRIPTION="Application that rotates tablet pc's screen automatically, depending on orientation"
 HOMEPAGE="https://launchpad.net/magick-rotation"
 SRC_URI="http://launchpad.net/magick-rotation/trunk/${MY_PV}/+download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 
-DEPEND="x11-libs/libXrandr
-       x11-libs/libX11"
+DEPEND="${PYTHON_DEPS}
+       x11-libs/libX11
+       x11-libs/libXrandr"
 
 RDEPEND="${DEPEND}
-       dev-python/pygobject
-       dev-python/py-notify
+       dev-python/pygobject[${PYTHON_USEDEP}]
+       dev-python/pygtk:2[${PYTHON_USEDEP}]
+       dev-python/py-notify[${PYTHON_USEDEP}]
        x11-apps/xinput"
 
-# there are not tests in package, default 'make check' does wrong things, bug #453672
+# there are no tests in package, default 'make check' does wrong things, bug #453672
 RESTRICT="test"
 
 pkg_setup() {
-       python_pkg_setup
+       python-single-r1_pkg_setup
        enewgroup magick
 }
 
 src_prepare() {
        # Remove unneeded files
        rm -r apt_* installer_gtk.py MAGICK-INSTALL gset_addkeyval.py MagickIcons/MagickSplash.png MagickUninstall || die 'removing unneeded files failed'
+
+       # Fix Python shebangs
+       python_fix_shebang "${S}"
+
+       epatch_user
 }
 
 src_compile() {
+       my_compile() {
+               echo $(tc-getCC) $*
+               $(tc-getCC) $* || die 'compilation failed'
+       }
+
        local suffix=
        if use amd64; then
                suffix=64
        else
                suffix=32
        fi
-       tc-export_build_env
-       echo "$(tc-getCC) $CFLAGS $LDFLAGS check.c -lX11 -lXrandr -o checkmagick${suffix}"
-       $(tc-getCC) $CFLAGS $LDFLAGS check.c -lX11 -lXrandr -o "checkmagick${suffix}" || die 'compilation failed'
+       my_compile "${CFLAGS} ${LDFLAGS} check.c -lX11 -lXrandr -o checkmagick${suffix}"
 }
 
 src_install() {
        #TODO: add installation of GNOME Shell 3.2 extension
        dobin   checkmagick*
 
-       insinto /lib/udev/rules.d
-       doins   62-magick.rules
+       udev_dorules 62-magick.rules
 
        insinto /usr/share/${PN}
        doins   *.py
@@ -79,8 +87,6 @@ pkg_postinst() {
                elog "  [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1} (${2})"
        }
 
-       python_mod_optimize /usr/share/${PN}
-
        elog
        elog "In order to use Magick Rotation with an on-screen keyboard and handwriting,"
        elog "the following additional package may also be installed for use at run-time:"
@@ -91,7 +97,3 @@ pkg_postinst() {
        ewarn "in order to use Magick Rotation you have to be in the 'magick' group."
        ewarn "Just run 'gpasswd -a <USER> magick', then have <USER> re-login."
 }
-
-pkg_postrm() {
-       python_mod_cleanup /usr/share/${PN}
-}