From: Jeroen Roovers Date: Sat, 22 Nov 2014 11:25:00 +0000 (+0000) Subject: Version bump. Readd missing patch (bug #527728 by Alex Efros). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f863f202f9ba71ca2edf627fc0aacf2737c9e65;p=gentoo.git Version bump. Readd missing patch (bug #527728 by Alex Efros). Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- diff --git a/x11-misc/xxkb/ChangeLog b/x11-misc/xxkb/ChangeLog index f20e21f69863..9a37dba157bb 100644 --- a/x11-misc/xxkb/ChangeLog +++ b/x11-misc/xxkb/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xxkb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.31 2014/10/31 15:47:08 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.32 2014/11/22 11:24:59 jer Exp $ + +*xxkb-1.11.1 (22 Nov 2014) + + 22 Nov 2014; Jeroen Roovers xxkb-1.11-r3.ebuild, + +xxkb-1.11.1.ebuild: + Version bump. Readd missing patch (bug #527728 by Alex Efros). 31 Oct 2014; Chema Alonso xxkb-1.11-r3.ebuild: Stable for amd64 wrt bug #523158 diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest index e8627db42b83..38774302bfbd 100644 --- a/x11-misc/xxkb/Manifest +++ b/x11-misc/xxkb/Manifest @@ -10,25 +10,17 @@ AUX pl48.xpm 2591 SHA256 557ac51268061af4c910f94a6d97aeac06123a6a63e7a60400fb9a8 AUX svg-appdefaults.patch 777 SHA256 fb30d8203a51d36bec73a1b4cfc95fa1cd013d43710b47747cebac398d048d2f SHA512 e98fa8ac9f9eae38547bae5dc7f1c5e7ad1f5ffc64706a0e2dbd98860eff2b33d7736048727898c28f53bfc2466efc3d52aef995f32733e0d2754320dc38db64 WHIRLPOOL 55bbfcdaff67f403e1b7730106e2f1b12acc25fdd1f4b4647814a678dc6ddb6628efb330a455c4da62a84eb92e5c429531d76a588428b1f863c37d6590dd8475 AUX svg-flags.patch 7143 SHA256 0102385fe0d201460781b12ecddc2a96ac03856ae664d272b7762ff92d614ae7 SHA512 e2d6bc62dc75d664007e4cb1d192ce4366ef9c859606e3ff4481d56bc8d0deeca32fa5727cab127bda832b5172ce7e33d5c2039463c9bc46df0679c24dd14ecd WHIRLPOOL e3724d1531139264b5f84171421965f0422970fcb53623729c0b2672e37df59fedfc5d26502d8f9fdb3029eccde17d13b7f3daf47159e318879fff4794a40e9b DIST xxkb-1.11-src.tar.gz 37262 SHA256 596d465bd39b2b660c1d19390a82cc5515cbf8f7e9600e82135564469e11bd3c SHA512 12675bee3be5a37b5e471fa763e2f8600859d5621dcf7ea9f004bad8f2200035582661cfb36938e9606582a86570e6de99c30dcf2d988c96604daf1185592c14 WHIRLPOOL da14d3ee40c35efa1dc3eb3b5df17a53540ed9eb007a7b8a42039dbf8bb97052d27ee77d04b3f115c002daebc0a7229aafb855621b057ab294b45cecb5beed87 +DIST xxkb-1.11.1-src.tar.gz 38123 SHA256 ceaa33bed81d8ae5bf77e89787d0736f7564c3de047c35a57bcbf6f4d1888142 SHA512 081629ccee41016cd468bd411c8584298bf64d4d791bf803490f6286a330401b933f895fbff2f4a6d1fcfe86c0490267f86d334436c1cea743ad08d97b26038f WHIRLPOOL 62b4847722ee8f23cc7db6f9bb21b1d01dacd2eb68d5d0db09933b9970c6846bc239d1388bd3d7ada2490a42ce1d56cffa1e1a7e55df029864ae426a0adaf96a DIST xxkb-flags.tar.bz2 2541 SHA256 f777c676a58ecab97c242efd703c0e8056cc2a93bb5b7a2fdb1f677348d6727c SHA512 c75929bf78a8aa84ffb615c85c2ad70110a9f7b0465891651a57e4772eae5e0ded61d10197f430f9cdd0cf707903af3d0af4250ff1743fdd59d9ff19bc0c33a9 WHIRLPOOL 7c626b2e6ec805b888ebcaeba658978efcbd4528729966a087ac7692b6c2e18ee5deb6dcb5eefea5a31826dce3ebb9c81a87cfc9e01efa5c18d800d8cd0bad6f EBUILD xxkb-1.11-r2.ebuild 1621 SHA256 9967b271ef7dc5e9a7096a3ed0a3df6f8144831f227292b723961608fa070263 SHA512 ad62044b79f8b36fc84fec3994e89310bc77a436f23a1232163fe753e98e6f972944bf85e4745b389371f600a305fc5249c4b460cf39512b3ffbff40ff5ca28b WHIRLPOOL 07311e6d0039b253da500a4a9eaf68ef052653e7a9b85630c41a1d4a201118422452ab38299daa2a5b373e86c950a9e1337deeb1e524cda28a07f323a004a39f -EBUILD xxkb-1.11-r3.ebuild 1626 SHA256 43b56e68859f8bd310ff64df7fee329e320f057d35bfcc72a9c9252212bf79f7 SHA512 583476977d3071c7087edd6111dedcc1ed5d32dc77ec176e952397a6b8cb132ebc485011b21c4ea163397dd1d8893b337e6529187a333b31b6c94c3639f347ae WHIRLPOOL b4b6f7848b49b44a028faf661ab87f759e448ba02bda2f69f5242b86c9a9d4da4540ba2cc0ef3bd7d27aac73e4d7267805bd0491787c6dec8d35d244cb940cc4 -MISC ChangeLog 4024 SHA256 4ca8c20c894f09c95f7d087cef82fcf80ef96db8ab090813a97d082f9212a886 SHA512 01306ea683bf8b92444efae83b7f7dab5713c63d4425b9048ef6f04c910f2ef3ea5268d81cea098ccf186b113d46457333cd3422435c99144008d937fb030b79 WHIRLPOOL 78125e0d726bff1f6a431b8ecc40b3f4445abe8080be1cee6be980d5aee338c65073ffeb8d52bbbe528f91094de06c6bd14945ec51ce75e5b79b0417d573b2c1 +EBUILD xxkb-1.11-r3.ebuild 1668 SHA256 f258c1fdda13980b3a383c58e30bf76afd4d71ff7f37f523638d08c59387595f SHA512 efa01e2bb71603a42e2b90a1ed84c9dbc6b74a5a739d331b4a593af0416885460484306988c7c3bfc0a77715c0af3732aa15184171557520951ef846514b0973 WHIRLPOOL 7f42bdb460f3717d3f2f46d4074c282a30f264fbb7cc101b7410700be6864dc3c95092169438498fcf886f296015b311662e7174e3d52e25c4db04302d0be626 +EBUILD xxkb-1.11.1.ebuild 1648 SHA256 45483a3e81b5938a057baf361ace0567101781c05e143cec1164ae278de0d6bb SHA512 aeb360522c5ad4edb79c692d8993d239eda93ebfa5e6b6e5f546787b263a64ee06140d9592f7cf95c592da913ba86f2fbf0461fa579d4de25d8666b98074a713 WHIRLPOOL d426762b74537e740df8ca310877cc96e10c2f1d5645f0d43f746d9063ce8476f8c118183f628ba7216d0d3e228b182c5b9e6623ea93146524662922410282f5 +MISC ChangeLog 4206 SHA256 d4a2322bab7b66432137b5eb90ff3b722a43509f3e349d77857bc693bdf9c43a SHA512 bc159d76f016e499fec030fb9665256cf01ddaebbe83516d91ffae2e3e426562f2063849be31994d3d86f48a1a50ff7c50fc2d959dea1341e745b6328f176e76 WHIRLPOOL 1932831ff60a34b26ec76b67ee089889b613aca956bb708cce0784fe5eb0ad79bf5a09c6a13539495263f83d35f00dbe3b99aeb05f62afec10e32623a90191dd MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUU69fAAoJEH/rgyzyU9sVaboQAJwMBdfeZ/8E+pYFcY6vafjc -D1xkCXM9fxVvcVsg5er82LRboTuUUN4GQiibMyRLj3dvhqG5HQ35gjYr8LAJXmbn -iVTXU+20JprrRQOodUzk6IplsbqrysduokXGjWO1d6xZ4xYTi940OXqu2+ETupjR -l38lOxM2/muempT0xVnPowUr1AChvVUomAuy2lR/d7T6hH70IKzeIZozfN5TKj3S -6zPBj+EZNexBrxtnnrJxEWnF278WAB3tMJZbG1/wXckvS/45k3/q8LPZz8mXxzxY -xa14AyVPoRkY2643VG6tOJHcDhVHhdA1aOFzLM6qCLyhcuqkFX+u61GQLeQVXyJE -rNV9XRGRHSvSBM2lQ/O9lubQPPhIQKKe8UFv16BXOy9DwDwLoB55uoGSb8sIJfWK -38Snwt0q7cOHjSIEALzxC20ecC4UHNcEggui648zMaDK03L/ElO3dVIZngwzwEci -YfSrGb0GVJV0jwCNuIIf3gd1OrbUSy4tO9dvw6uNfZ+HPk3r7DsmugVoF5yEe4xA -k4QwkU3pnKltzz30BAVfRn/wsJAz2e/ZqFKaps6eSO8rr7DcFHtfIHiwTsNcP7BR -L66Yx/uR1QJ03X+Oi7eY9v7VCX07/Zbt+YCkYEPqqyBDLqKF8h3wv/vNPsKm1TDz -3O+tc89dXai2eJ+Kiy8C -=YnLm +iEYEAREIAAYFAlRwcowACgkQVWmRsqeSphMrUACfQx1SeK0hgwZ/1Wruuati0X3x +SBkAnRZjynAVSq/7c1J6OXGmGX/G9pvq +=+OsF -----END PGP SIGNATURE----- diff --git a/x11-misc/xxkb/xxkb-1.11-r3.ebuild b/x11-misc/xxkb/xxkb-1.11-r3.ebuild index 8ac2defe516f..5cf6428d2651 100644 --- a/x11-misc/xxkb/xxkb-1.11-r3.ebuild +++ b/x11-misc/xxkb/xxkb-1.11-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r3.ebuild,v 1.3 2014/10/31 15:47:08 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11-r3.ebuild,v 1.4 2014/11/22 11:24:59 jer Exp $ EAPI=5 inherit eutils multilib @@ -40,6 +40,7 @@ src_prepare() { if use svg; then mv "${WORKDIR}"/flags . || die epatch "${FILESDIR}"/svg-flags.patch + epatch "${FILESDIR}"/svg-appdefaults.patch fi epatch "${FILESDIR}"/missing_init.patch diff --git a/x11-misc/xxkb/xxkb-1.11.1.ebuild b/x11-misc/xxkb/xxkb-1.11.1.ebuild new file mode 100644 index 000000000000..f0ffc1e0c633 --- /dev/null +++ b/x11-misc/xxkb/xxkb-1.11.1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.11.1.ebuild,v 1.1 2014/11/22 11:24:59 jer Exp $ + +EAPI=5 +inherit eutils multilib + +DESCRIPTION="eXtended XKB - assign different keymaps to different windows" +HOMEPAGE="http://sourceforge.net/projects/xxkb/" +SRC_URI=" + mirror://sourceforge/${PN}/${P}-src.tar.gz + svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 ) +" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="svg" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXt + svg? ( + dev-libs/glib:2 + gnome-base/librsvg:2 + x11-libs/gtk+:2 + ) +" +DEPEND=" + ${RDEPEND} + app-text/rman + svg? ( virtual/pkgconfig ) + x11-misc/imake +" + +src_prepare() { + if use svg; then + mv "${WORKDIR}"/flags . || die + epatch "${FILESDIR}"/svg-flags.patch + epatch "${FILESDIR}"/svg-appdefaults.patch + fi + + epatch "${FILESDIR}"/missing_init.patch +} + +src_configure() { + xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die +} + +src_compile() { + emake \ + CDEBUGFLAGS="${CFLAGS}" \ + EXTRA_LIBRARIES="-lXext" \ + LOCAL_LDFLAGS="${LDFLAGS}" \ + PIXMAPDIR=/usr/share/xxkb \ + PROJECTROOT=/usr +} + +src_install() { + local myopts + if use svg; then + myopts="PIXMAPS=flags/de.svg flags/pl.svg flags/il.svg flags/by.svg \ + flags/ua.svg flags/su.svg flags/ru.svg flags/bg.svg flags/en.svg" + else + myopts="FOOBAR=buzz" + fi + + emake "${myopts}" DESTDIR="${D}" install + rm -r "${D}"/usr/$(get_libdir)/X11/app-defaults || die + + emake DESTDIR="${D}" install.man + + insinto /usr/share/xxkb + use svg || doins "${FILESDIR}"/*.xpm + dodoc README* CHANGES* +}