summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-10-30 17:36:57 +0000
committerJustin Lecher <jlec@gentoo.org>2013-10-30 17:36:57 +0000
commit1122ab419bd8492049e809ea0d36e9af782b930d (patch)
treedff891fe03c86420ab2097166398dd3094302535 /sci-mathematics
parentMajor version bump (diff)
downloadhistorical-1122ab419bd8492049e809ea0d36e9af782b930d.tar.gz
historical-1122ab419bd8492049e809ea0d36e9af782b930d.tar.bz2
historical-1122ab419bd8492049e809ea0d36e9af782b930d.zip
sci-mathematics/pspp: Fix underlinking and out-of-source build
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/pspp/ChangeLog9
-rw-r--r--sci-mathematics/pspp/Manifest28
-rw-r--r--sci-mathematics/pspp/files/pspp-0.8.1-oos.patch28
-rw-r--r--sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch29
-rw-r--r--sci-mathematics/pspp/metadata.xml4
-rw-r--r--sci-mathematics/pspp/pspp-0.8.0.ebuild4
-rw-r--r--sci-mathematics/pspp/pspp-0.8.1-r1.ebuild (renamed from sci-mathematics/pspp/pspp-0.8.1.ebuild)22
7 files changed, 102 insertions, 22 deletions
diff --git a/sci-mathematics/pspp/ChangeLog b/sci-mathematics/pspp/ChangeLog
index 8099287dcc81..31733d5309ca 100644
--- a/sci-mathematics/pspp/ChangeLog
+++ b/sci-mathematics/pspp/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-mathematics/pspp
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.25 2013/10/30 16:21:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.26 2013/10/30 17:36:56 jlec Exp $
+
+*pspp-0.8.1-r1 (30 Oct 2013)
+
+ 30 Oct 2013; Justin Lecher <jlec@gentoo.org> pspp-0.8.0.ebuild,
+ -pspp-0.8.1.ebuild, +pspp-0.8.1-r1.ebuild, +files/pspp-0.8.1-oos.patch,
+ +files/pspp-0.8.1-underlinking.patch, metadata.xml:
+ Fix underlinking and out-of-source build
*pspp-0.8.1 (30 Oct 2013)
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index 2075f5018a46..76fc7d0bee2a 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
AUX 50pspp-gentoo.el 171 SHA256 92296e81ab389b4c639a67cd015e19d63cf8e40664a95fc568c2c6b6e7608940 SHA512 3e50a08018a0892df4beb400041ec682c94446b4e05ce7d5907ef20eace5426245e684160e85c8629650b8a911e92ef98200638dea1f12d0304fb4e1a8db5883 WHIRLPOOL b6193455db73c4cc90f4548179a77b8a10cbb8a3cdefede9834c4a4e4a9470d6e85474dbd411a8e0015d4b95f6c59574eff4036c7079bd1a1ad1c2c6aee7b482
AUX pspp-0.6.0-as-needed.patch 380 SHA256 4461de6c4109d85e7ec77d626bb39ac2ece904200412b77202184659bca048fc SHA512 f8096fe3e926aff946039449bc30da94a54e84864ddb851a625a378f651fcd06a3ff6ff2d1464b06951ec3dc8c875fee376e452d911b9aa8a5ab8a9232839a7f WHIRLPOOL d9f51858b0c2ddaed40e3cac807ceba568f08b048b90430b864af032062b33022801873f590b5cc06ce0c3ef3a13d22af6511dec043bcda2af05be52f6f0c234
@@ -7,18 +7,30 @@ AUX pspp-0.6.2-gtk.patch 2166 SHA256 6b983930e4081400b545f20e8109ee5b4137da229b5
AUX pspp-0.6.2-no-test-pgsql.patch 388 SHA256 70de6b53d9d82c478c82e8d44a9c0d2aca451792df92ea23c8931036a61e9512 SHA512 675ac283139bad3561ed7dd37d14fd9ca04ffaee0aef877130715a7427309035d35c19f947839cea8757086ee6106ff1f8d1c6e0c246c0c8c004496c8972c089 WHIRLPOOL 9676a89224528537a5e6f649fb569ce6e7a65c92b4a1c1e1792108cf85188acdb77618e5fd6cfbdaaaac52b216fcd3a8a1908f8258a67f3d6f84c2eead6376da
AUX pspp-0.8.0-as-needed.patch 279 SHA256 ed0bae25ae7553d85a89340da6ca5b28ed81672aa1bea8a9981bb5d1bc6d0126 SHA512 7568105a4b8aad62139109d48827a7228f92233e7733d947be31e5654610d91b34e3c034090e93ff80f202eb56e7ecb2c4811a0b1b9f2dd2d839836aea660e77 WHIRLPOOL 1bc76807f22a838e58149d84aacabb77dde3767084f6a14b3a4bbb09de926e262fcecb6cdf96a1ab373fba87b3f484c10f1f7a63da7c1e90f21591fb69ba8de1
AUX pspp-0.8.0-gettext.patch 341 SHA256 729337a7be52fa0d7b6dbb33e27292534594d892e52f07a717b348a2538af73c SHA512 b3ed3055f6c0daf8d9912e21e1355e346e15f3dae71eec6415645dbe6fc3ee88d4ac3a8fd6ff8be36167f247869107c9238140b1eee2c9855bf4026766de5991 WHIRLPOOL 35ce229e878287a37bb5d1c9b6deed09bea997777112597a7b7569c2b81ed900f10fb64177a044e92f6ade0708fd0727ed707f8bf70eb1414a1c5d7c0f081cbb
+AUX pspp-0.8.1-oos.patch 1124 SHA256 f04693390d4c16145dd738b75e6337d69db73099aa8a3b5f10b48b14fd114124 SHA512 ba7c3b48291a3d48d703b5fa3816e8b3257b8f728de4bdfa37b222af989162e59407147548d797a4bcb20e926c14cbecf3f99a7ade404328b70e08f45b3a31b8 WHIRLPOOL 9ec15ef8206646a0e9365a9975c8a6022dc1de1d93fee3b53051234ff34a32d9c531a00961aab36de0ff0422c84ba13225e5fa56f8e80a8672e95ba3d9cc8d31
+AUX pspp-0.8.1-underlinking.patch 815 SHA256 f9988ebc655881bec2cd30db7b889b0fa12aa97bf463be29c4be88692b399c8f SHA512 82a4cc05ca88b3e49fbc36111e547b117b5f94afaa587ab8a5574c7f4429fefb5538eda57ca90785c29558002ed5d38e2cddce03219ab511bd5b90eae800c72f WHIRLPOOL ff3c23f157631a925cad73f2d602e1e7944360f5b58d347bc02deb5eba95ec799c5897963aaaad46afbada68d2dfacecb99bc30720c0223ad0251f3ad73f9199
DIST pspp-0.6.2.tar.gz 3375748 SHA256 ec9639a3dcd3663b8007e600ab1a56291214334a9bba2e8d8c5a314509826385 SHA512 0dfadb1fc5087ac0b076559902c08870ce1ad0111fdba23231c71954a675c6ba14b26e631b44cc9097a8c54c8530dba45d88165c6b428b47f1a636303989e84a WHIRLPOOL c0c9a6b2ed69059798c6b3710e39b8bfb697bd1693e6d6e6157cee8d173b2d7857ff76eaff7a78afb074e1b8c431dcdd1a5513c28abbbf31e4efe03728d69918
DIST pspp-0.8.0.tar.gz 5526759 SHA256 f1b11a8d68449e917afa05c2378248935296a4fd5fa6d66dc790b64c5adaa966 SHA512 c95e326c691cabcd12c42eadd8ffbb5ad2c57114ac8c47a86eb1149ad49d10a3ff34347b9fe4a649d5920b9efe4638aaa622977f1ed6ce15009322e5e239aeb7 WHIRLPOOL a3f90a4867d939c589a5da01abea67f17f4cdd0c7bcd0dc02aa49f6818897eebf30042fe2744d0072a990243a41d99452cfbe05e94c16a1213d9a149a63eac57
DIST pspp-0.8.1.tar.gz 6514528 SHA256 fd48145d2ff77c39f624e26bf3c9a5623c2afaee7c040675b06cb4ce57d31d62 SHA512 2df758b3a2d8eba724d84ce7d77a6c0bbe469a11b86a8eb4227ec12a4957f468e74b3af0f81c953d87403a962937eef2680979a21ceba4fe8b93b55252b84a18 WHIRLPOOL 5be6ebcecffc3d8a7da669ea49028307b784a5b8b5d8a510d0f9e82a3740800966da5390f8abc120b55c9c621850be906f7610f86404b92c994d9a72697d413d
EBUILD pspp-0.6.2-r1.ebuild 2284 SHA256 bdf8a296a9a4ff6c7dcc736e249dffdd4123ee06cdd671cafbb97c6cc1702a6d SHA512 05c230cbcf8062137f315e3785a8158761eacf82fec6e7522c2787bc4baabe1b6781dcbad8304222f153e0bda3cb383d317fa1daae6c3bf1fa06ae1d92407256 WHIRLPOOL aadca1c4e1061babf3108c954ff9345fed0ceb718b59907bd95470b64becc28ad014684c0591f425f2e096b32c65b8bc9989b16dcfa80cd7a779e16994f90b83
-EBUILD pspp-0.8.0.ebuild 1986 SHA256 f4ce87ba6c7851a2109bef4abdce065775d7a959b45bfe650e92310a346e5042 SHA512 80e883f59f7a9a8ba4ff515002a51cf96f788742962971af44e91c6f926be13fb6d03afeb37886ad6f196540e411bddd018ab01279dbfedca0deea92daa4d753 WHIRLPOOL 142d3dda49a8c1c7866d98e83d680e6e00816f92f12554ade920ddc066cdfb2e6fdb1c1fc0780d56d75bc7bdac3baa09e35f22fce661deabad40ee4fb8f8d276
-EBUILD pspp-0.8.1.ebuild 2018 SHA256 fa264b489f2165d7ed56f98cbdb98895a043f94aa4916d0d4741b318f7df953d SHA512 5d887ffd6a0234789328b15d20ed81440fb2925b81e8ba5f2f14f0a4140d93d15298f46b4271fe94df3fe24ad95bdeef871fde3d05beae32d6fd6e2b6f65fbef WHIRLPOOL f34960f5d92467f3fd6d0807b5ed548c2b9205b115956d3022ab976f394ee6e7ed0a196030021ffe5410f1101d00f2ffb4817a4f7007b0f06a2b3947490bb881
-MISC ChangeLog 4483 SHA256 bfb73b87130d815fedf9687b1478f50c1ddd2e6017bbbd425bdb712ea3d0f95b SHA512 ba3570a5fc19b40df73b69552b6b212d04034263b0c4281c026a02309d12596034be6e0822dcc7dccbe687d16a967f1dd938e6301d7dcdd6f33eadfb6c62c17f WHIRLPOOL 2b17a3c29ef7436c19a0c9aaaebc68ff28e2a22f71c1385907a2a599cb3b418093a654663f547b1a8613622af815e50c60fc7f684a14cfdad17bf20c0f8a1eda
-MISC metadata.xml 603 SHA256 699bb5fc8c9db7ef70683c986f3f120d541098edbf7a190f6f7becb13f52d436 SHA512 6805deeda19892da0100515f49f2b3c2f156224bc3f9b054774e74e906118cbe7a13c1c28134fc7b4ee33e38e2db46b6b9c861bea01978ae7fe4183ff8a05837 WHIRLPOOL 0b64c96a4b254cd340a76076a8ac857a39d02c7f2b6b14d7fc43770e6e0f44089de11c5ee7afec6e62a13308d2816ddc8db9f14de1b947b7eaceca9764590656
+EBUILD pspp-0.8.0.ebuild 2016 SHA256 32f589ed0a34d8e615b4f08c2fc3aedfcf71277a1eaf92f9c998ee833badefbf SHA512 40fe46743bbdeeeacaeea60743df2d229759a36059d2458a2699b22d3e0faf905f3f3de54098716c24273b17e45c2257aee8fc2472a509579f997a94d215d553 WHIRLPOOL 448b179a19be9fe961d5c811a49f1ecfd8889670936bb7a4d6b095dffa0f56848fc93f11edd239912090948a48a22371240b714a7721bccc6d1ad99eef8d6e32
+EBUILD pspp-0.8.1-r1.ebuild 2026 SHA256 c47425ab6d37e375c7b7940bd96cf2f746d4d3e442eb727f690df155bc593324 SHA512 87e97f46bcc8669403201cd883157a4929e91b5d776c03da13829b7db7777a17189d10b3ea31ef0fc5e1a2215539e9cd00b4a2bf30a32190ada1b38ab62f5262 WHIRLPOOL ffce7a73741188bbcf64aa2623ad0694d285cd58bc258534d109b8f26afc91aa81d7b93085f34e2398ba972ce0df4833d97f5ea0893d9f09d54ad1ec58499249
+MISC ChangeLog 4747 SHA256 706f9f74ec4fde962893b0b001c0d00cf3e6acdc17bf82aa435e76ec56b389bc SHA512 0173d6a86a5af8a0dd1fa98d9efffc3a680a1fec74ab5afcaece8267241ae7a97cd74e089fc884131a7fb149d272cbb2e5ffdfbdfde9620ce583a0157fd8bae1 WHIRLPOOL 992cf788b9fc710614aef1c56b2bc8bdbe73a032aec2e93bcf18b43bd4a0412e02404b18aedfcf2eaa4ecacf8a13d8219b57a4f45ea37989e99c7e3decf15618
+MISC metadata.xml 607 SHA256 6edb6b42de17353fc929b96d74ca5027d09739ae64db9c92fc8ba0f1990c951a SHA512 787f44d8d1badb137eeeea804fbe5c071a26dbbc09bf9b7850368569384c8dde21e25260c44bfd8665c0243e8b5a611ab7eef5271d2ada066f2d280223a2347e WHIRLPOOL 92b8ae37621d6f4b394b4da0414ed993a42adeb804a56424b2774e9164715214c24cde9f150ccd255fb67a142c5435c79dc48064b8abb7e22bb93222435ea37b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlJxMiAACgkQ1ycZbhPLE2C7VgCgo38x8yU0cpMQZMLpm77p/FfU
-gvEAn3FX/1dGbbs9lefpUGRl3abEzP7f
-=wHNM
+iQIcBAEBCgAGBQJScUO5AAoJELnU8jG9FVirg4AP/jiWOLKolF9oBaOqk8uk4Mmk
+2oYqbjkY6T9OUhw7F0GPWFiFgZLKmb/lRPJWvs1AVBKFksC9xY6uTR4ONvm2ASPm
+W0Dhlpyo8l8pgBNguaH+7nit2fGsosTRznm8cs1FBnVVhWwfZ+6c2rdZj7QeO3Je
+oIlWhWl0U6uGtPA8RgVi2ZJTB4CNIjEZBQ87ofT0dGZGoVM/t+2zjoeO7k5bI2HS
+wT/ufChSdiiW2LYLHFhO+LIp2twvEBawR9MtdDsc/4zPKyJ/2FCVg99hQYI7Y3z/
+maJwj62sqyQ4XkZzpBHvCKB9ySdh8QUHtLPgOgGPwg6g7Ut5TWVJWPnQNz/MSmtp
+MOz8vpH4fSsWtS2JNo85bvFS4FiKmCw6vG1PheBI0XxfqlkySXgjhU26lb68jJ9r
+n1976ZohUcaxPFx48y88vpiP573gMdmchauaNUEvZ1LID+mJnu5e1ZaOGi9cZv2O
+5vJeWKb63i704rmv0/H8cy7kbdVJDIv7JgBSZNIWjfqeum+nwewkD4SAYHH3zHmq
+AmQbBi0S2ffJvAuL62mdGxkJ+J9FMFieK9W3S2CzPTygGa2jNJfW1FjYOEUFijvl
+VMOsYo90IK6nysbLAihyWEdzfW8Z4k11jyKNRgjCm6RRVs8X/z+OpdwhNss5GMud
+UOqmPh1BHSP6OopU/PdT
+=3Jek
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch b/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch
new file mode 100644
index 000000000000..51612b993abd
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-0.8.1-oos.patch
@@ -0,0 +1,28 @@
+ src/ui/gui/automake.mk | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
+index 47a3215..24f5b0b 100644
+--- a/src/ui/gui/automake.mk
++++ b/src/ui/gui/automake.mk
+@@ -333,16 +333,16 @@ PHONY += yelp-check
+ AM_CPPFLAGS += -Isrc
+
+ src/ui/gui/pspp.desktop: src/ui/gui/gen-dot-desktop.sh $(POFILES)
+- POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > $@
++ POFILES="$(POFILES)" top_builddir="$(top_builddir)" $(SHELL) $< > ${top_srcdir}/$@
+
+ CLEANFILES+=src/ui/gui/pspp.desktop
+
+ src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
+- echo '#include <config.h>' > $@
+- $(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
++ echo '#include <config.h>' > ${top_srcdir}/$@
++ $(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> ${top_srcdir}/$@
+
+ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
+- $(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
++ $(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > ${top_srcdir}/$@
+
+ desktopdir = $(datadir)/applications
+ desktop_DATA = src/ui/gui/pspp.desktop
diff --git a/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch b/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch
new file mode 100644
index 000000000000..2c533ee49658
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-0.8.1-underlinking.patch
@@ -0,0 +1,29 @@
+ src/automake.mk | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/automake.mk b/src/automake.mk
+index 73ff813..8524000 100644
+--- a/src/automake.mk
++++ b/src/automake.mk
+@@ -20,7 +20,7 @@ src_libpspp_core_la_LIBADD = \
+ src/data/libdata.la \
+ src/libpspp/liblibpspp.la \
+ $(LIBXML2_LIBS) $(PG_LIBS) \
+- gl/libgl.la
++ gl/libgl.la $(CAIRO_LIBS)
+
+ src_libpspp_la_SOURCES =
+
+@@ -28,10 +28,11 @@ src_libpspp_la_CFLAGS = $(GSL_CFLAGS)
+ src_libpspp_la_LDFLAGS = -release $(VERSION)
+
+ src_libpspp_la_LIBADD = \
++ src/libpspp-core.la \
+ src/language/liblanguage.la \
+ src/math/libpspp-math.la \
+ src/output/liboutput.la \
+- $(GSL_LIBS)
++ $(GSL_LIBS) $(CAIRO_LIBS) $(LIBXML2_LIBS)
+
+ include $(top_srcdir)/src/math/automake.mk
+ include $(top_srcdir)/src/output/automake.mk
diff --git a/sci-mathematics/pspp/metadata.xml b/sci-mathematics/pspp/metadata.xml
index f2949f6a5894..d62366a4d9b2 100644
--- a/sci-mathematics/pspp/metadata.xml
+++ b/sci-mathematics/pspp/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+ <herd>sci-mathematics</herd>
+ <longdescription lang="en">
PSPP is a program for statistical analysis of sampled data. It
interprets commands in the SPSS language and produces tabular and
graphical output in ASCII, HTML, or PostScript format.
diff --git a/sci-mathematics/pspp/pspp-0.8.0.ebuild b/sci-mathematics/pspp/pspp-0.8.0.ebuild
index 5014465ca37a..867a2f0e6a8a 100644
--- a/sci-mathematics/pspp/pspp-0.8.0.ebuild
+++ b/sci-mathematics/pspp/pspp-0.8.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.0.ebuild,v 1.2 2013/09/10 02:40:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.0.ebuild,v 1.3 2013/10/30 17:36:56 jlec Exp $
EAPI=5
@@ -27,7 +27,7 @@ RDEPEND="
virtual/libiconv
cairo? ( x11-libs/cairo )
emacs? ( virtual/emacs )
- gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 )
+ gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtksourceview-2.2:2.0 )
ncurses? ( sys-libs/ncurses )
postgres? ( dev-db/postgresql-server )"
DEPEND="${RDEPEND}
diff --git a/sci-mathematics/pspp/pspp-0.8.1.ebuild b/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild
index f595323d4024..fb0d545222c7 100644
--- a/sci-mathematics/pspp/pspp-0.8.1.ebuild
+++ b/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild
@@ -1,20 +1,20 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.1.ebuild,v 1.1 2013/10/30 16:21:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.8.1-r1.ebuild,v 1.1 2013/10/30 17:36:56 jlec Exp $
EAPI=5
-AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
inherit eutils elisp-common autotools-utils multilib
DESCRIPTION="Program for statistical analysis of sampled data"
HOMEPAGE="http://www.gnu.org/software/pspp/pspp.html"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-3"
SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="cairo doc emacs examples gtk ncurses nls perl postgres static-libs"
RDEPEND="
@@ -26,9 +26,10 @@ RDEPEND="
virtual/libiconv
cairo? ( x11-libs/cairo )
emacs? ( virtual/emacs )
- gtk? ( x11-libs/gtk+:2
- gnome-base/libglade:2.0
- >=x11-libs/gtksourceview-2.2:2.0 )
+ gtk? (
+ gnome-base/libglade:2.0
+ x11-libs/gtk+:2
+ >=x11-libs/gtksourceview-2.2:2.0 )
ncurses? ( sys-libs/ncurses )
postgres? ( dev-db/postgresql-server )"
DEPEND="${RDEPEND}
@@ -37,8 +38,11 @@ DEPEND="${RDEPEND}
SITEFILE=50${PN}-gentoo.el
-# if autoreconf is needed, might need patch for gettext in
-# https://savannah.gnu.org/bugs/index.php?39708
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.8.0-gettext.patch
+ "${FILESDIR}"/${P}-underlinking.patch
+ "${FILESDIR}"/${P}-oos.patch
+)
src_configure() {
local myeconfargs=(