From 9e96c274e6c38ad70c70733712b39991311f1df3 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sat, 21 Mar 2015 10:12:47 +0000 Subject: [PATCH] Use ecvs_clean and modernize ebuild style Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- app-editors/fte/ChangeLog | 8 +++++-- app-editors/fte/Manifest | 30 ++++++++++++++++++++++---- app-editors/fte/fte-20051115-r3.ebuild | 23 ++++++++++---------- app-editors/fte/fte-20110708.ebuild | 13 +++++------ app-editors/fte/metadata.xml | 8 +++---- 5 files changed, 55 insertions(+), 27 deletions(-) diff --git a/app-editors/fte/ChangeLog b/app-editors/fte/ChangeLog index 5fe03faa5e66..5c97329df183 100644 --- a/app-editors/fte/ChangeLog +++ b/app-editors/fte/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/fte -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.58 2013/04/03 17:57:32 tomwij Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.59 2015/03/21 10:12:46 jlec Exp $ + + 21 Mar 2015; Justin Lecher fte-20051115-r3.ebuild, + fte-20110708.ebuild, metadata.xml: + Use ecvs_clean and modernize ebuild style 03 Apr 2013; Tom Wijsman fte-20110708.ebuild: Extensively tested. Changed HOMEPAGE according to the dev manual. diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest index 3e77a5200b3a..cb6905679e95 100644 --- a/app-editors/fte/Manifest +++ b/app-editors/fte/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX fte 604 SHA256 ab2f22eb5fe1d1df82c0f976a457979f66b0c4f605fb69baba46d50204021f0c SHA512 5f93df643282016c352db88cddd37c1b9f86d94654a7eff0089b9d349ad3f56ba4266cb2431ac3a418bd4b5aebf6d7ad04c26099061942fd3e90fc9fb938322b WHIRLPOOL 8ba69515823d2f340559acc9b39b36952db41e66c49c652e200edf7d550f7c1ef6332264ec2806c91bab420a54fc202c109b37c594ee1aa36aead047fb6781cf AUX fte-gcc34 1092 SHA256 c3f452a0b72182c50a2f3057a10d749d8a304890b0844ad9ee572cf4ebf83811 SHA512 390da870507786d74d67847d644c07d9c24789913117c46fcd8739f5ceb58345ac100a7cd1e2ef1183d09e76f923b73cd94fa523f5eaa3d6113a952240fd4800 WHIRLPOOL 488e5e72a87a50be21da96ca04c4b743bb3f55cc709d59ebce2887140aff9afde03229b4264d0ef0624902e87872da3ffd9a652aaabe1456926b989611a5fc72 AUX fte-interix.patch 1041 SHA256 e4289d383169cbafdadb4868a4ca64a43a6f70da8870b34c2228eda9ae6317b7 SHA512 6f43c682b577b838675fe93c9e2b4c225e3c853d2db95f81f84d64508e78c6f957f1c8842343df2d9a6e7d01e5103a6cc2a1cd0cf414cee641b6b11c0d551b78 WHIRLPOOL 9eb0bb3401695d5609a314495f4af91f756cf895b1649bc75a0b462cfa7fff0d56b6060832fe9b51b80c90d12414eba5c4e74d3f1bfb0c138b1864a66fd03631 @@ -7,7 +10,26 @@ DIST fte-20051115-common.zip 187849 SHA256 794031dd1d06156259d21ddcb3dec31960018 DIST fte-20051115-src.zip 549216 SHA256 bb4135e5c39223fa346d20613052e69090b14ed46855d5134bf2dbc4ba40d962 SHA512 320c2c4f27041ff5e7417288e5acc8c776013da4aa7cfc187e6207086851642a7ed961383ca19f6ae6c1717a59453c6a9ca40a1c7eb77dae6e5b9184cd7c346a WHIRLPOOL e8c3e84b7986a7900ea81dfc2b5285edb1f8d413769b400898a3b08083a7b954502d8e57f8a0d74d3d487ad7ea93227e334a89a6e178112cf1dfcf72c25357e4 DIST fte-20110708-common.zip 200007 SHA256 58411578b31958765f42d2bf29b7aedd9f916955c2c19c96909a1c03e0246af7 SHA512 0bb59a5b6b4a5ef6c1234dadd8922cd50a13ad1f0c06d6046b74a95592ad55f720b43bbc78a42cab63dfc68c5e073d44d5179bd6ed72f346563f43f3c5c146f1 WHIRLPOOL 9d3ed7205b8daf8c4959b8683e979d47a3c842471f312fdcf03a6c6dc36f66bd7dede6a3bb9d4e91f7a91f554165b7360c755857d685dfe55478ae18672cbe55 DIST fte-20110708-src.zip 504199 SHA256 d6311c542d3f0f2890a54a661c3b67228e27b894b4164e9faf29f014f254499e SHA512 2d59fadcdd988ee85b87425c343341e1b768a7e9ef838c5f8a1f22c4adc5bf2cc37d547f36354ca1740bce07b33d5ae93d14e24001b9dbd3b1b267986564a089 WHIRLPOOL 8a2c7a9053780092fe690b19dfb419bdb66c0617ac49c1fec312ce75fd480bbf691d24da34eeeb38ee267af0eafbc5fd6c6caf06c25ee809b917caa32a9dce51 -EBUILD fte-20051115-r3.ebuild 2901 SHA256 cd0ce39997367a23c5e262703e3952c08da885465c8d1f93e7bd568237fc7fac SHA512 bc575ef73d0ef012c05943ba78ad775a5a851e67a502c49cf3254e0d573772d91cd7babacf51d5d055342a05cf354442dc9be716455cd5bb6b4266d063eb2df0 WHIRLPOOL 3d15d7dbddbb102cda044b18520aeb1727039d0519068d8cc8f860a3c41df7691569eb9724ef0480728a88581a8172e7673a25411a77c3865f5e034d736ef84e -EBUILD fte-20110708.ebuild 2990 SHA256 841ccd47f333ff651366b8c65adedae16ac23c958b902835a3d980cef5e9f7bd SHA512 b31a40d605a5a58fed716bf1c49177b010656ead83e9eafecbe0c7ec220b1d755de49a46822025854bea03fe78927c2c4b9a263da06e21d70c6c82b03381e0f1 WHIRLPOOL 5d076976c922cfae6aaca728639f4b3bca7f120dadaf14a7f8d3b332833b6b0b336eeb6d79679c3a9909cd07a33104a542cd499fca21060c3f695e5e02d1e75d -MISC ChangeLog 8987 SHA256 b25d5e4f7637cd2cfe4ba2a2ba7cd3e7c5dcc2cbb2bc5fb0a5b21e07965b88b2 SHA512 fc91a8f811e394f00ef5c16ca694d837ca661eb56dd5c42374e1798fc720f8d061f6fc34c66ed8d85b06c462f3b78829c9262c057f8ce20790fc3156f612da03 WHIRLPOOL 319a673e151c33d8b099cb409c7b2417662a47c34ff97e74ba9e8a3d2bc9d71ccfb16f9bbcf873a760db4759fe05c328a116939e3a715879734ae64b674053fe -MISC metadata.xml 278 SHA256 bb1b426900febb4f6e773e0bd5b5d8b501fba655c9345f2e22f8667b8e5db76e SHA512 79045ee486e7e381698c63be0e662a9110e8c889d6513710be769a1daed18cad7eedea0c4732c4a7c6b79a6d2aa65556b794c3c5cf234ac10d9f138fce57b841 WHIRLPOOL a08e4adb0426a94c6ab7097f0082f7d81fe5be716f9f6d3bcb5473942989a38fcf5b42ea338ba066a39dc1e9085b97de9155094b3be7ecdb2b7fe64990d8f2a3 +EBUILD fte-20051115-r3.ebuild 2854 SHA256 deceb7249cd2ff1acf7674748e558f8c995e0daf00b341c94b5cfe974639b309 SHA512 230ac81764d17c9fbfab636aed1440665b505d643c164ffb0bcfd457fad96884d7102640217fc104e58e18c50c289916caa5173661566596e6318b348524c75f WHIRLPOOL b936e0fc7ef9d4cfd7a7ffea79e7cb174397508454aaf233beff1be951176f311da7eb363baa3e2c5e93dc891761ea5873c20a32ddc1455230e53a3478ddb224 +EBUILD fte-20110708.ebuild 2967 SHA256 c250c76376f67bf32e77e44853c073d85ea03481d3042195e0f3bc90cac14b78 SHA512 234457bdb4c7fee56ec0038917c41e714dcfae704dfde0fd5d71fd00c9c9629811203991f9374e0136c2dfa8b6606178e73248d87c4c479f2244f54f66b8fbcb WHIRLPOOL c9a347fd5586ffb8714fe6c2b8d888c52507b1a1755adcb874a8c40af2fd6eff9b161eb28df0486dae87cdea6766d44fd278b5b152067f85e9ec7aeaae085e53 +MISC ChangeLog 9138 SHA256 9f056043f89acd046ba2b3d0db0533c22152d1415fdbbe619829f8d84fe6261f SHA512 6d5de6144a5ca3708f69438df64d1a3e5f7b6b668bc16d2bdb9fc3551f331aed25a3a519e0cecc4dc920d74f233062a75434dce381f4156b12ad57ceff68e945 WHIRLPOOL 8289f35b22986bacd7170acc052fffa6aca73133b6eed3d94130692fcccb7e919a5144c65067374f9557aea40d174fccb1fb4604d196b72a32e0df76ea025ac0 +MISC metadata.xml 285 SHA256 fa0d0e95b31b1fa3e6d8fbe6ba199ef8bdcfad59d51f16f6e689c5099ad2a71f SHA512 2f49a5f8f742337f4dbca9eb900ce346dbb35974382e6c9073c6886ad82198cac584f0a6a48834eb36ed5b24cdde849a24dc9fd5a8d62ff56bee45cda25f92e6 WHIRLPOOL 937949615fdfed5a31e727d2530b5b8e104ae86d9c178a0f38d8e818d8a6cf51b9da2152dea3aa178783df45f03f861277d36bfdc5c4d930f8f5ccb468b466b8 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCgBmBQJVDUQfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViraNQP/A55ez0G66kk3Dl+oM/AJ8y6 +tlo9nYNeOXeX90ERjncfs31ie3HIObNQc/tl5Oc00MGa61ycyT82+l0SaUbg5/7U +Oy041oehioGzmiR8HVuOH/91Q73vKR4o/jqv+j6YDb/zCWs2DqRsEcrp/feWeyJk +8U5pDzCB1rtNZRmzqdrUwoKyRg82FmtdQuSomgdUw4F+0hUOGrvGaLHev1Wwbm6O +Rk7YkrOCAkAw2SrjVrDxB+NulFd1cSMUzBwMY912jIf14/jelm/4R9lsaXNFiAs6 +OjCFzfvqHBtM6O8p21REkmj5NJh0nAe5D430gByMDEfcT/8e2/QD0AXfniDFd7JA +IW/b0TBlEyar5r+kae/qcj9LwHNYu0reYsr2tAql35ycGGfoOkVd//yibUxhb257 +o0cqdxROcOB/7FBLCvKtcnAXi4ayd2e2Wqb417Cjb/MsBxwUQHTxsHEuT5lBXA6w +CXK0Ua5uzLPM/zeuZyY31DkAn5aDJR+yvPhy+35xX071cEU2zCtrgG5yv8vcmLfm +SA2IQkJ5NA18BowmlGf/NAahqvvefIxZJRCfaj7wmKP30GXYYtIzhfbnWfvXeHIV +LmCLD9/SoImPRwZ1hvGJWDbR1WmCikNN4NEgwd5DnHzGhzP8zvLFlx1qB45qcT4M +Amv5LfLJGu4E1GwyppXt +=EgVX +-----END PGP SIGNATURE----- diff --git a/app-editors/fte/fte-20051115-r3.ebuild b/app-editors/fte/fte-20051115-r3.ebuild index fac44d3c4380..e3e00fb94482 100644 --- a/app-editors/fte/fte-20051115-r3.ebuild +++ b/app-editors/fte/fte-20051115-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115-r3.ebuild,v 1.5 2012/11/21 11:15:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115-r3.ebuild,v 1.6 2015/03/21 10:12:46 jlec Exp $ EAPI=4 @@ -8,7 +8,8 @@ inherit eutils toolchain-funcs DESCRIPTION="Lightweight text-mode editor" HOMEPAGE="http://fte.sourceforge.net" -SRC_URI="mirror://sourceforge/fte/${P}-src.zip +SRC_URI=" + mirror://sourceforge/fte/${P}-src.zip mirror://sourceforge/fte/${P}-common.zip" LICENSE="|| ( GPL-2 Artistic )" @@ -18,7 +19,8 @@ IUSE="gpm slang X" S="${WORKDIR}/${PN}" -RDEPEND=">=sys-libs/ncurses-5.2 +RDEPEND=" + >=sys-libs/ncurses-5.2 X? ( x11-libs/libXdmcp x11-libs/libXau @@ -41,10 +43,11 @@ set_targets() { } src_prepare() { - epatch "${FILESDIR}"/fte-gcc34 - epatch "${FILESDIR}"/${PN}-new_keyword.patch - epatch "${FILESDIR}"/${PN}-slang.patch - epatch "${FILESDIR}"/${PN}-interix.patch + epatch \ + "${FILESDIR}"/fte-gcc34 \ + "${FILESDIR}"/${PN}-new_keyword.patch \ + "${FILESDIR}"/${PN}-slang.patch \ + "${FILESDIR}"/${PN}-interix.patch [[ -e /usr/include/linux/keyboard.h ]] && \ sed /usr/include/linux/keyboard.h -e '/wait.h/d' > src/hacked_keyboard.h @@ -57,6 +60,7 @@ src_prepare() { -e '/^LDFLAGS/s:=:+=:g' \ -e 's:= g++:= $(CXX):g' \ -i src/fte-unix.mak || die "sed CFLAGS, LDFLAGS, CC" + ecvs_clean } src_configure() { @@ -108,11 +112,8 @@ src_install() { dodoc CHANGES BUGS HISTORY README TODO dohtml doc/* - dodir usr/share/fte insinto /usr/share/fte doins -r config/* - - rm -rf "${ED}"/usr/share/fte/CVS } pkg_postinst() { diff --git a/app-editors/fte/fte-20110708.ebuild b/app-editors/fte/fte-20110708.ebuild index 88245f7b70cb..831d67bfdafc 100644 --- a/app-editors/fte/fte-20110708.ebuild +++ b/app-editors/fte/fte-20110708.ebuild @@ -1,6 +1,6 @@ -# 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/app-editors/fte/fte-20110708.ebuild,v 1.2 2013/04/03 17:57:32 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20110708.ebuild,v 1.3 2015/03/21 10:12:46 jlec Exp $ EAPI="5" @@ -8,7 +8,8 @@ inherit eutils toolchain-funcs DESCRIPTION="Lightweight text-mode editor" HOMEPAGE="http://fte.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip +SRC_URI=" + mirror://sourceforge/${PN}/${P}-src.zip mirror://sourceforge/${PN}/${P}-common.zip" LICENSE="|| ( GPL-2 Artistic )" @@ -18,7 +19,8 @@ IUSE="gpm slang X" S="${WORKDIR}/${PN}" -RDEPEND=">=sys-libs/ncurses-5.2 +RDEPEND=" + >=sys-libs/ncurses-5.2 X? ( x11-libs/libXdmcp x11-libs/libXau @@ -58,6 +60,7 @@ src_prepare() { -e '/^LDFLAGS/s:=:+=:g' \ -e 's:= g++:= $(CXX):g' \ -i src/${PN}-unix.mak || die "sed CFLAGS, LDFLAGS, CC" + ecvs_clean } src_configure() { @@ -111,8 +114,6 @@ src_install() { insinto /usr/share/${PN} doins -r config/* - - rm -rf "${ED}"/usr/share/${PN}/CVS } pkg_postinst() { diff --git a/app-editors/fte/metadata.xml b/app-editors/fte/metadata.xml index 1f70d629f0d4..2fef4d7262dc 100644 --- a/app-editors/fte/metadata.xml +++ b/app-editors/fte/metadata.xml @@ -1,8 +1,8 @@ - - maintainer-needed@gentoo.org - -Lightweight text-mode editor. + + maintainer-needed@gentoo.org + + Lightweight text-mode editor. -- 2.26.2