summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors/nedit')
-rw-r--r--app-editors/nedit/ChangeLog8
-rw-r--r--app-editors/nedit/Manifest16
-rw-r--r--app-editors/nedit/nedit-5.5_p20110116-r2.ebuild (renamed from app-editors/nedit/nedit-5.5_p20110116.ebuild)47
3 files changed, 43 insertions, 28 deletions
diff --git a/app-editors/nedit/ChangeLog b/app-editors/nedit/ChangeLog
index ea598a30b6e6..4526ef820822 100644
--- a/app-editors/nedit/ChangeLog
+++ b/app-editors/nedit/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-editors/nedit
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.68 2013/05/15 13:10:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/ChangeLog,v 1.69 2013/06/23 12:26:22 pinkbyte Exp $
+
+*nedit-5.5_p20110116-r2 (23 Jun 2013)
+
+ 23 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> -nedit-5.5_p20110116.ebuild,
+ +nedit-5.5_p20110116-r2.ebuild:
+ Revision bump: EAPI 5, epatch_user, correct dependencies. Drop old
*nedit-5.5_p20110116-r1 (15 May 2013)
diff --git a/app-editors/nedit/Manifest b/app-editors/nedit/Manifest
index 61d7d55ebbfb..ccaa356f16c8 100644
--- a/app-editors/nedit/Manifest
+++ b/app-editors/nedit/Manifest
@@ -11,13 +11,17 @@ DIST nedit-5.5-src.tar.bz2 1124825 SHA256 0f6ae7205753080e8b047fb45759a7d6036b19
DIST nedit-5.5_p20110116.tar.bz2 1030011 SHA256 a69d765d933829b6d0447516aef6a1157b52c1b7dc99cd5713b10632b6294bd8 SHA512 ab635c9037c1599009684a1f40779f688c8e16a8b1294ffe88ff8d2466411beefa7e6324edd59b18fe4764fe6b66e83aa277cf87d4fcea5f4b223d951fc603e2 WHIRLPOOL 31b95fa483110a48a66c946142e5e924209a5c4b1a2a17ecc54844be26edbe3c0118595c546d570cdaed35c9aba7f5faeb247efb39f2f161a9dd115ad0b37faa
EBUILD nedit-5.5-r1.ebuild 1299 SHA256 b1a791b237587d26ee9074e067fa9472a7611900fca47adc4876a3c359641882 SHA512 a7b0c0b8e52bd56e278543f5c5fb7cb356ae1dbe88e2ecac0db2b21e44e231e0a35c006913ebf19f711246dd705d420250cb7400099e51ee070cc5c80f7afb77 WHIRLPOOL 94f60b6f3bd07461a6fbf5126747d84a95c706296dac558cab8ffa261c87beb30c4091ea54690d2d8ec6c6391b885c093aa9518e1141e009baa09d713b3e9102
EBUILD nedit-5.5_p20110116-r1.ebuild 2002 SHA256 c5c2fc69f0d3dbb780c79234c6614abfca0cb2498c9a7918d19fa8c137402a26 SHA512 fdcca4770e413e64a4738bae463b3c93166e87602aebd7e574c9552267c59e81eaff66bb7db3485c76ad47342ee4f840bbaadf7b2e07569549ca3e1af35542eb WHIRLPOOL 5018325aa76cddab7400d48e8cc966add1eb1175c9be0542af2479a03602d79d00aca50bdb60914694e5fd4be3b827f5ebd64b8149f6a9f0e533a3df325152cc
-EBUILD nedit-5.5_p20110116.ebuild 1906 SHA256 041a60821f9441a9eee92f9d93ab78d4ae8f34d9eee908c25d4fc1cb8aef6ed0 SHA512 9a9dbdffa934dd24f1bd69364943e2bff57eb4081634d45be9d3764b15bf9e2c909f8d26dabfb17cbc153ce67f79da75a866124ee111f8ef46a0d78ee8bbf187 WHIRLPOOL 2df1dd7ab523bd4ca4afc92428b542c02bd180e0016f84c78acec2758c292fb9a625984d8db53a7a2644c18fd6602373ad572559637698beeba96d2b8aaeeaf1
-MISC ChangeLog 9641 SHA256 9169d73330ccfbdbcf1597d4dd19fe97ba5a6a261844740a96d9e5b2e5444dbb SHA512 a514babba255359be62ea218eb806911c3ca32291d0734adcc6ce03757cfc964ad345f77e47dea3b8c3b71cb863b4e80494b59d3f4e6a374807b883e3efb6e1b WHIRLPOOL daf2e604c5b23a2dfcb5799e53127d264ebb0121d5c0dc212cb913a14e6585e28126a076168da97b4d74a1634f0514371d32a67602d2a96796caafecbcba07d1
+EBUILD nedit-5.5_p20110116-r2.ebuild 1992 SHA256 b547294086e0db5a22dc3dae32c60c44af354b0e727d7be1e2a5c915a2fadb14 SHA512 3f33e80469061ca5d867bd0d44abf385cc22fa35cb94b3b1ebd3c9e46d81a6344e8088f63104eff2ce09aa6fe9ded8f9a014cefc0adcd9175751123d7141ee05 WHIRLPOOL a01163a873bd9d3d5bd9fb64fd6dca2ec5095700fc985615380437e272592d1f54608cdde2206e6aa257cfa10a66bc64f7630fda557c99f4f9cec19bde3ed35e
+MISC ChangeLog 9868 SHA256 f167e7131d97433b03ae1178f322feae2fdd526a7a14fab7f7a3079e01b226da SHA512 5b695c4eed9c4c114404bc6182548eccfa9fc1584a41670ce86620274547a2ecd42878b519eace26efc87e272b684cc014b7accb5026aab415fb8a59a7ff6684 WHIRLPOOL c065957d08ec1cbb05226c3f867e04d3d1004743e65cba6ee8d63465916b72aae3eda63d51afd13173715639505cb3167620fd196d9ce4e1f8a61cce57b10975
MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iF4EAREIAAYFAlGTiWQACgkQknrdDGLu8JAuagD9GY+SEkVEnDZgmOdKgTjLVC6x
-t6fy6FW82pBh7xcbNIwBAIOtpVQN9/3snkdQImfqggI/sgeMk/jEe/y2/jz58TVm
-=jzne
+iQEcBAEBCAAGBQJRxulvAAoJECo/aRed9267TjAIAKe0z6SHqfdnniOt6khGRfLX
+ykL+LER+VwTdlXjpz7kbShc5D0U12eRgamwA8jwtraJI4gLLke9AfCuQVT1+bZCY
+l9v+UB2+70VH87fxT/5DlCiJW/siNpnO4fRFo0pD+8fc+gcmfmvCqtdeEPKL7Jp2
+JpzU9hW5rgNLXv9ty1mL0s+rlfEycQ++fJdYt8Y1dPK/5zDnZiN4X1I1oPbggAi2
+kFrm0ZnYvhVgwEeOvSXkzMfn/HO6zc8x9MeCw0pDzlUSNyWSbLPHy0h6UgrdrMCB
+2RU4IwJNvSFTfc0KvvDFl0RMVEavpOTIiV08/0O0gvGVjv581NCFn+XDOwZXUr0=
+=Odz6
-----END PGP SIGNATURE-----
diff --git a/app-editors/nedit/nedit-5.5_p20110116.ebuild b/app-editors/nedit/nedit-5.5_p20110116-r2.ebuild
index 129e22ea826c..c5063bf11a95 100644
--- a/app-editors/nedit/nedit-5.5_p20110116.ebuild
+++ b/app-editors/nedit/nedit-5.5_p20110116-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116.ebuild,v 1.4 2012/10/24 18:58:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116-r2.ebuild,v 1.1 2013/06/23 12:26:22 pinkbyte Exp $
-EAPI=2
+EAPI=5
-inherit toolchain-funcs eutils
+inherit eutils toolchain-funcs
DESCRIPTION="Multi-purpose text editor for the X Window System"
HOMEPAGE="http://nedit.org/"
@@ -13,11 +13,12 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
RDEPEND=">=x11-libs/motif-2.3:0
x11-libs/libXp
- x11-libs/libXpm"
+ x11-libs/libXpm
+ x11-libs/libXt
+ x11-libs/libX11"
DEPEND="${RDEPEND}
|| ( dev-util/yacc sys-devel/bison )
dev-lang/perl"
@@ -34,9 +35,6 @@ src_prepare() {
-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
sed \
-e "s:nc:neditc:g" -i doc/nc.pod || die
-}
-
-src_configure() {
sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
makefiles/Makefile.linux || die
sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" \
@@ -44,28 +42,35 @@ src_configure() {
-e "s:-lX11:-lX11 -lXmu -liconv:" \
-e "s:check_tif_rule::" \
makefiles/Makefile.macosx || die
+
+ epatch_user
}
+src_configure() { :; }
+
src_compile() {
- case ${CHOST} in
+ case "${CHOST}" in
*-darwin*)
- emake CC="$(tc-getCC)" macosx || die
+ emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
;;
*-linux*)
- emake CC="$(tc-getCC)" linux || die
+ emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
;;
esac
- emake VERSION="NEdit ${PV}" -j1 -C doc all || die
+ emake VERSION="NEdit ${PV}" -j1 -C doc all
}
src_install() {
- dobin source/nedit || die
- newbin source/nc neditc || die
- newman doc/nedit.man nedit.1 || die
- newman doc/nc.man neditc.1 || die
+ dobin source/nedit
+ newbin source/nc neditc
+
+ make_desktop_entry "${PN}"
+ doicon "${FILESDIR}/${PN}.svg"
+
+ newman doc/nedit.man nedit.1
+ newman doc/nc.man neditc.1
- dodoc README ReleaseNotes ChangeLog || die
- cd doc
- dodoc nedit.doc NEdit.ad faq.txt || die
- dohtml nedit.html || die
+ dodoc README ReleaseNotes ChangeLog
+ dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
+ dohtml doc/nedit.html
}