From 9e3a5f0f27382f31750a89c9df6b60e11f22c344 Mon Sep 17 00:00:00 2001 From: Yixun Lan Date: Tue, 10 Mar 2015 15:57:35 +0000 Subject: [PATCH] version bump, drop old, also fix slot warning, bug 542760; thanks Ervin Peters Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xAABEFD55 --- app-editors/scite/ChangeLog | 9 +- app-editors/scite/Manifest | 36 ++++---- app-editors/scite/scite-3.5.0.ebuild | 87 ------------------- app-editors/scite/scite-3.5.2.ebuild | 6 +- ...{scite-3.5.3.ebuild => scite-3.5.4.ebuild} | 8 +- 5 files changed, 32 insertions(+), 114 deletions(-) delete mode 100644 app-editors/scite/scite-3.5.0.ebuild rename app-editors/scite/{scite-3.5.3.ebuild => scite-3.5.4.ebuild} (90%) diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog index 1c8da09f5ae9..c20529ab7009 100644 --- a/app-editors/scite/ChangeLog +++ b/app-editors/scite/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/scite # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.179 2015/02/17 10:38:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.180 2015/03/10 15:57:24 dlan Exp $ + +*scite-3.5.4 (10 Mar 2015) + + 10 Mar 2015; Yixun Lan -scite-3.5.0.ebuild, + scite-3.5.2.ebuild, -scite-3.5.3.ebuild, +scite-3.5.4.ebuild: + version bump, drop old, also fix slot warning, bug 542760; thanks Ervin + Peters 17 Feb 2015; Agostino Sarubbo scite-3.5.2.ebuild: Stable for amd64/ppc/x86, wrt bug #540346 diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest index 580e13118816..e41893a257ff 100644 --- a/app-editors/scite/Manifest +++ b/app-editors/scite/Manifest @@ -3,28 +3,26 @@ Hash: SHA256 AUX scite-3.0.1-no-lua.patch 632 SHA256 30a228b95cfbdfd3c9dbe01e78a2ed887dbff92f7e3b04fbb254a5777cc66bfb SHA512 7aaf72b7e58bcfdf4278c6dce4f62f5679513f1de68744e7bc842ff7e4c6ab792c5149df07f50206c638a70d1be1261fb21e3cd1fe603c13f9350674a6bbdf45 WHIRLPOOL 770367be441ffd06a3db7d0503ba9b2a5d163afdb6ba503624c79b9ad4417e097b338ce65ba54a3bc072bdb7c99c75359df7e4fe6e4e0a90bc0dfd80d9f9a1c3 AUX scite.desktop 138 SHA256 f91b1e14fdb6f78901001ece140eaf1dc60efe6fc0364f6f145671964a0c40bd SHA512 9e226e4207ccaf0ae654e0456906547d9eaa77d5f09e057e56a657ae06fe909a759a8ae30bb625ec556f72a3a7105fc1f4407f1f51c05c40ba2cc1ec08469da6 WHIRLPOOL 6a0de80f0eb8479e54e644e8a729d4b45bba6b0ce2fd0662309ed4f6e70b4e36ff531cf23a220485e0ec26bb0349efe782279d9a7e66d1d54af99f3520a1de60 -DIST scite350.tgz 2265217 SHA256 bf7260a7538a642ad008db067ddf5f1752c3326059a5a7ae4885f08431f1d0b5 SHA512 96ce19112707f6150751ab09e6c2fbb9822573d025c0f49062c6b95d1ab4b218123500fc4a1a8a175729afd9444a9ebf36892007ad4cd7a3bd55239e50a21b70 WHIRLPOOL a3d41e16e27ca69bec4b13656ab3f74358e8e77a1359c9fd104af4547359e8c29af9820290833b679931d115a09342473113af584a2af57258a757e2622aff32 DIST scite352.tgz 2277393 SHA256 d1b9a12f1b8ea80f28564a1695146a59b4a03099c8ca8693e3a9ce02bb0a2836 SHA512 01bf36dbb4d02f3693a759f778110b913dfbb733d0a5d006c5de78cb627c3511e821b62fa0a410174c09917a09d41d9a94535a14b7a4c77801eafaace15a586d WHIRLPOOL ee39f57944ef60182a3ac8a409cfd4829cfdee85a7b9b91b2722bd3d9d8b2a6f480cd8db1281826f4a9543575ae99dfc66cfe905592a2acae9ad7728d5862695 -DIST scite353.tgz 2293082 SHA256 d667c4f6cacc6d906e1992048c23eac4cb83c9ced7ec3df320d7e3913f167f10 SHA512 d00e29beb83e7289c2e807373565f4a9540e284a5e537e734c40dc6d7e2c4042a2c12b2c720747cb65ffdf579f804a47b929541d207a9713af7c4f89f1c5672a WHIRLPOOL cdb395ed93d9a893540c32579130ec9cf5ae514b846e9d88b51797e507c2f5d77d45c4ced919eb208520757f97b75fb2e2a9d8b2110cbcc98ddf82f1f1265277 -EBUILD scite-3.5.0.ebuild 2199 SHA256 9ac6fa73efd18fbc4fefc54b42e11821dfc4969f332914af5b3e81ded1ae12d4 SHA512 1e879cd6b67c29a0d9e281abde728278e18a0af2dacf046379a07b26f00ea3c355b3c782207d8ab91c129db7843d93f67ea8b283465f3389b72ab448bf27842a WHIRLPOOL e891d4ba0c239fd375c8132037b097828041e3c740796b7fb6f2033a3ef4eb958e765cf4009e978445244d80a419a6608aeeed15125d56e678409f3fdfab0134 -EBUILD scite-3.5.2.ebuild 2199 SHA256 bff567a50a1d036be471abdbe200730e490b2c733091b863d0ab3c77cc6b4179 SHA512 06534966b253cc247a78915766bf8aaf2e7ae3e8e576851ace4d6dfebb4e86173229b0be04d4ff5d50d4a0e355612c5b2e5d640cbf27c5f85e510e1de5c3b878 WHIRLPOOL 71267be1bafb2681f683cb5c1efcbb64ed5c4dd37a5350d628326461afa73319e6c683358ae45ad584aff4fd7f638a90a9624530add5e0e1eec23002cb8d3e11 -EBUILD scite-3.5.3.ebuild 2146 SHA256 c1340634613f08cbdb0ac19f601673983250ec4da4613de086e5ed7287287c83 SHA512 ac7f1473688a32781f6a256a2c5819ec00b0edc3a299ca32d67a283eb6e7ca562dd6cfcec0db1c2f62f02412e4b25f1ef8c2fa35d1963ecc55b03c7be5a43fa6 WHIRLPOOL ad3f8d85bae7e57b2d982f11154f3115c7a88dbc25342e10ef97861db8045bc871a33727faab798a45ec8a21426440ebac31f93d1eef67ea1c7f779185918d9b -MISC ChangeLog 24836 SHA256 457b2c00cdf8c642a24f151b41228c944bc979433aba9d11365583b51b1ce812 SHA512 0e66d948fd4e1011b38144779731dee095dcccf2c6f800ecedb0cca6fdea1f652b1da916b3bfa14fad099c6f1a29034c03293338b76619d317e0f7f6f7f1bc21 WHIRLPOOL cd3534b76239dd648cc2b3ca0e08defc1f9ca89ec72d34b88ab7573a7690942ad8174d1c9e91d7638c129d2e2e3f20319efaebded91b49cac851719ee0710af5 +DIST scite354.tgz 2301246 SHA256 96041bb6a3aed321e353db7c8fcde720b99cab98cbfa2ef62a5e07dd523e1495 SHA512 213f9d3ac359541f8ae2ec6166770b6cd20631ffc82e9de3b0a23753c2913f232544b4a8001a697042ff7bb4dec72f1d0b1148124fea386d925a7d394b8995e7 WHIRLPOOL 348c64b4d7019935cac018d1f2fcb8aac4713762ffdd766c309a8d7114bbe58f769709a3e5d8d446d58f60f8715d4b1e0ef04dc36b69096d7f9ce0f2c7d50a30 +EBUILD scite-3.5.2.ebuild 2205 SHA256 a663a0ef739711cf968a47b4cb578e55e71d1e36f49c2e65a06c3176efbad092 SHA512 046c3a1dcc1329a5492583a09fc9499ac57e283e7571fedeb7b94ee0238110b7cdd1fd4e47f004c3fac88abf71b911b3b497b7c862c3280ee7f8b0d56ac37c97 WHIRLPOOL 83e861e5896862ef56b2b945b7a94475424e216b9541e506c6df8983eb1e8aed7688b97bd75db4766e6c3ec6ea092e3089e18fb7282abef880a9165fa1b9c8fa +EBUILD scite-3.5.4.ebuild 2144 SHA256 8f5c3d03863fbe9857c45b33cca7b78b9686b29949d98a3397fbd03d95dc3387 SHA512 da09b8a8b11504d37898c87e7b3cd59320c6111cf2f8d84b904455e3dd4748934f7f9ff32ce26ff63c2d08c31b7c2f76dea6fd3eff57c0c21cb8e8107ccf9b78 WHIRLPOOL 33851ab0c1dc4e98629a75a3e701e01065d8891ef358fe960b6f5a5e411518ef147600330c5af060bc118e0e19b4f26277faebe6e65d52890b7600388ec33100 +MISC ChangeLog 25077 SHA256 45e8b2aa49f3225f8c31a11ef6b4e8e2ffb54fd8b619bcc17b0ae1eb497a287e SHA512 981847c3c26b869e789525763e7b500db145ff3c1d3bd7d971e0db2e7e5335ddc7c1fec6f1f9b64f42e55e989b20e1e304161439622cdb3039741829abffa257 WHIRLPOOL 5af7f77332af244170e44f8325844c9a66d403373e8185084ee59e25ed58b983e04dc71435dd2954c33c8a3185a0a879f797ab18acdc41aa7cda52ec94720def MISC metadata.xml 329 SHA256 f632088d3836f99589a97e8775549daa47daa4457514361e0d0db8582cdb9412 SHA512 93ec545888e84209f8d979147c7e29426e99f1302939cf3546196e088a2c462331dca395cf885de10c0058eded6d6d84ef51526b089f54196191c44209bf2b89 WHIRLPOOL 95c5217189606f2d719b98232f6e73894eb14528b7379148b4d3cf6868164ceefdfffe946353778367e75020fc8ad440406c3567775957f06a2a13d0d0cf2bf1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU4xo5AAoJELp701BxlEWfwLsQAIpdr8OH6FkPZVQSf1ptx2HX -tNmyCmVmOOIwdvSYQ4wHAKC2LkeHLcLQRthH/YCWM77rKB9T8WmDpIIId5jyKctG -SZRvTGV0YYK0egk+MTcf+VcS5gxBQkehoWW/u5YUgK2Lra2n1OMYUTmHJ1LM0UGs -pnZi0Za460eC54CYQTRhFInStrE3REn/kDp2IxypmModu+tmxr3Zd+L+bnYRQ5Fc -XbSTYvCIVT043xvkxt6wD0dvSiO/ysCkHCN5JWNC9Q8V8aIm5lTz9u7b0fw70um9 -2ojK8xySwq9j3ddW28z5ifBVKKq9sLUWEa/JTbUoQOc0Jrj80SbHOt22S65lVtQi -sTpSxP4dQkQs4nBUe83ZbqesBIlhtBp/2JqJs8PsD+/fP4a735CYY4x6zCkMcpQH -X66JuVuaeHVCmY8pCSdo3dFeIQjSal3dUu7wL2VGM0rfcy7awt1clOu/vHOjLoyH -oqy/jQHyuQPKPAnyLNBJYheaoAqfxCiGmPFf3m8c94qiGMLQ9lfXkx7FHanKiK5b -E/fqpAGG5fzkQUah+J2OjZRNZ3mJEaFNAOI7C89W51M0yegW3C4vnCLNl6ki8ICp -8AWDXPEUUQgGij1brLro/k1ACIVDEziKeMfql16XS+3YtjM/zA/YLqkYeg52ZBCd -XJbsClSrPL9S2MiXQL4o -=FoaI +iQIcBAEBCAAGBQJU/xRvAAoJEJIMDbyqvv1VIf8P/icfxqT3jWiKpUPlmFw/r3du +US7xuW8qAGG9UwniSExjLWq1GNVeneGaXtSVnKUCk4BI8QokKwYl0KbiqTH+k4gF +3DcR1c2MdajFpX7cj0btJUeYA9kZn1WRBrta2KmdB/vADmln/kZcK7Shtx93jFoH +zs+a8mP004w+uTRmWgPFX97AWnLdarezdG6k2zDB/RMJGsC28R3NOClLOGxtpx67 +8RU58E0ZT1DmsFPTXrkffsHnITrHnCilJIia3048Fpss/umqoa33WVoLwz0/18LT +u6/V3v4Uj4yAnRPGIA8BX6m/D79fLiSvNKsRcX3E/vTBusG/2M1xkzUYrJB3wZHS +Kw/ni3+Kh6N2IaKB3vvhRiq7OUSpBUsxK1PFqgz0odVwBA/mbF8zA0hopa52hDcT +VIeCWeRyVb9anvhTzlvqJT+H1SWeQ5Ri63M0elp+Jqixzj6nkA40ikVFiT14oiB/ +Rlce86C8VKv9HEZ3yXEgVlPe2ylQLLUbFSwnTgr+TFQKcdZ1N3T0BWT8WxLarTZr +T3WO6UbqhjTJoF0hNs0ZV8CJTMIBpRR13Mw7mq2j5HOEGxWHFc4JLkcGjdHfRzE6 +f6yoEJ02pYKHOUg+F993BbL7dqdrimKSzf+NhLasKX9ZPlU0J0oBat9ZitA8p2h0 +r7N/6M4tKO4AGCvhVNQb +=Cuze -----END PGP SIGNATURE----- diff --git a/app-editors/scite/scite-3.5.0.ebuild b/app-editors/scite/scite-3.5.0.ebuild deleted file mode 100644 index 916a05f308c3..000000000000 --- a/app-editors/scite/scite-3.5.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.5.0.ebuild,v 1.4 2014/10/18 14:19:47 ago Exp $ - -EAPI="5" - -inherit toolchain-funcs eutils - -MY_PV=${PV//./} -DESCRIPTION="A very powerful editor for programmers" -HOMEPAGE="http://www.scintilla.org/SciTE.html" -SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz" - -LICENSE="HPND lua? ( MIT )" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux" -IUSE="lua" - -RDEPEND="dev-libs/glib - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/gdk-pixbuf - x11-libs/pango - lua? ( >=dev-lang/lua-5 )" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-apps/sed-4" - -S="${WORKDIR}/${PN}/gtk" - -src_prepare() { - cd "${WORKDIR}/scintilla/gtk" - sed -i makefile \ - -e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \ - -e "s#^\(CXXFLAGS=.*\)-Os#\1#" \ - -e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \ - -e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \ - -e "s#-Os##" \ - || die "error patching makefile" - - cd "${WORKDIR}/scite/gtk" - sed -i makefile \ - -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \ - || die "error patching makefile" - - cd "${S}" - sed -i makefile \ - -e 's#usr/local#usr#g' \ - -e 's#/gnome/apps/Applications#/applications#' \ - -e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \ - -e "s#^\(CXXFLAGS=.*\)-Os#\1#" \ - -e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \ - -e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \ - -e 's#${D}##' \ - -e 's#-g root#-g 0#' \ - -e "s#-Os##" \ - || die "error patching makefile" - cd "${WORKDIR}" - epatch "${FILESDIR}/${PN}-3.0.1-no-lua.patch" -} - -src_compile() { - emake -C ../../scintilla/gtk AR="$(tc-getAR)" - if use lua; then - emake - else - emake NO_LUA=1 - fi -} - -src_install() { - dodir /usr/bin - dodir /usr/share/{pixmaps,applications} - - emake prefix="${ED}/usr" install - - # we have to keep this because otherwise it'll break upgrading - mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die - dosym /usr/bin/scite /usr/bin/SciTE - - # replace .desktop file with our own working version - rm -f "${ED}/usr/share/applications/SciTE.desktop" || die - domenu "${FILESDIR}/scite.desktop" - - doman ../doc/scite.1 - dodoc ../README -} diff --git a/app-editors/scite/scite-3.5.2.ebuild b/app-editors/scite/scite-3.5.2.ebuild index 350371ad42c2..49a9d2e1c77a 100644 --- a/app-editors/scite/scite-3.5.2.ebuild +++ b/app-editors/scite/scite-3.5.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.5.2.ebuild,v 1.2 2015/02/17 10:38:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.5.2.ebuild,v 1.3 2015/03/10 15:57:24 dlan Exp $ EAPI="5" @@ -16,12 +16,12 @@ SLOT="0" KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux" IUSE="lua" -RDEPEND="dev-libs/glib +RDEPEND="dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango - lua? ( >=dev-lang/lua-5 )" + lua? ( >=dev-lang/lua-5:0= )" DEPEND="${RDEPEND} virtual/pkgconfig >=sys-apps/sed-4" diff --git a/app-editors/scite/scite-3.5.3.ebuild b/app-editors/scite/scite-3.5.4.ebuild similarity index 90% rename from app-editors/scite/scite-3.5.3.ebuild rename to app-editors/scite/scite-3.5.4.ebuild index be9024a8a7e6..5f0842f3eac5 100644 --- a/app-editors/scite/scite-3.5.3.ebuild +++ b/app-editors/scite/scite-3.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.5.3.ebuild,v 1.1 2015/02/16 09:13:42 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.5.4.ebuild,v 1.1 2015/03/10 15:57:24 dlan Exp $ EAPI="5" @@ -16,12 +16,12 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux" IUSE="lua" -RDEPEND="dev-libs/glib +RDEPEND="dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/gdk-pixbuf x11-libs/pango - lua? ( >=dev-lang/lua-5 )" + lua? ( >=dev-lang/lua-5:0= )" DEPEND="${RDEPEND} virtual/pkgconfig >=sys-apps/sed-4" @@ -70,7 +70,7 @@ src_install() { dodir /usr/bin dodir /usr/share/{pixmaps,applications} - emake prefix="${ED}/usr" install || die + emake prefix="${ED}/usr" install # we have to keep this because otherwise it'll break upgrading mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die -- 2.26.2