summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-lang/xharbour/ChangeLog8
-rw-r--r--dev-lang/xharbour/Manifest20
-rw-r--r--dev-lang/xharbour/xharbour-1.2.1.ebuild (renamed from dev-lang/xharbour/xharbour-1.0.0_beta1.ebuild)22
3 files changed, 22 insertions, 28 deletions
diff --git a/dev-lang/xharbour/ChangeLog b/dev-lang/xharbour/ChangeLog
index 60731a8a2..2a1271367 100644
--- a/dev-lang/xharbour/ChangeLog
+++ b/dev-lang/xharbour/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for dev-lang/xharbour
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*xharbour-1.2.1 (15 Mar 2013)
+
+ 15 Mar 2013; Patrick Lauer <patrick@gentoo.org> -xharbour-1.0.0_beta1.ebuild,
+ +xharbour-1.2.1.ebuild:
+ [dev-lang/xharbour] Bump, remove useless useflag, fix compilation
+
19 Jul 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
xharbour-1.0.0_beta1.ebuild:
Switch from deprecated useq to use
diff --git a/dev-lang/xharbour/Manifest b/dev-lang/xharbour/Manifest
index 0fe471936..434bafe18 100644
--- a/dev-lang/xharbour/Manifest
+++ b/dev-lang/xharbour/Manifest
@@ -1,10 +1,10 @@
-AUX xharbour-as-needed.patch 5807 RMD160 e4a44c1b1da169142e69cb31dbe5b677d5fd8b6e SHA1 fb095344e7d79bbf2deeb167745c1b11d7a88f72 SHA256 6704203fb9449f7a55a14f82b7141a2a9049969f5729b1c23a14ef8ee9655d05
-AUX xharbour-fPIC.patch 942 RMD160 e82e793b6de7314e8da3cda111aa63e5ce13598e SHA1 fc56c72b607f63ed9e09cbff799d22b6f1170952 SHA256 7e6998d863950c0a2bf0f80ea9b031a7c3db81b6bbf311aad367762ad1a2e04b
-AUX xharbour-mkinstdir.patch 386 RMD160 b36d7e51971926063eee2386a457f45b416b85f6 SHA1 668500f4f160e667b55be2a0b8d9ad2bf471e6f4 SHA256 caef1428aa93c7e17460ef71016a599f31680b327cb448716c860f094b045f44
-AUX xharbour-override-cc.patch 386 RMD160 99adb22b936e79bc248a191fe5faf2a1efcda842 SHA1 6b4e6b65b47b99db986408428e507f8c0969789f SHA256 34ff14823b720241cfcae5e99cadc834d8c6da21155f9134979d15e13ac62969
-AUX xharbour-parallel-make.patch 3736 RMD160 3c4d3986a912c463b4c4dbfd73d79cea96e84c6b SHA1 e4c7c34e04db45fadc7a45904a448b01bbe47d60 SHA256 b57b85917a0d962fea6ccc8d938318bce436dff62ec2081795f50c97935390b5
-AUX xharbour-skip-static-utils.patch 256 RMD160 afd46e6127a2bbcae080c14edfe5e833933b614c SHA1 17e4951348de79196138d199e7df5c8704df370c SHA256 4a0b6792b3126ff8fc24e00ebd15ea77de12542476d5990d3298f356e607d2a9
-DIST xharbour-1.0.0-beta1.src.tar.gz 4599382 RMD160 201c45aee776efbd41da5c4bd7c2cb7637c78f48 SHA1 b874ec86a265ad80263c400f0e72516082747719 SHA256 0ec6faf77be2a3842465e6dc1337c760331152fbe1f9f2f95c18e59823cd3e66
-EBUILD xharbour-1.0.0_beta1.ebuild 2950 RMD160 1acc346c3ada169ff3bb0f58032af2715170f8ab SHA1 09be83986d44591855ac98a24a2355c23e23e714 SHA256 a87d827dc525e5357e50a73453fa0c56d87f790a4178e3db05107f7ff8fe54ca
-MISC ChangeLog 1131 RMD160 e0976088b742258cdde689139d1681aa1fdd93cb SHA1 0dca2fd65f631a7b9b4b269ddbfe7298648bba7f SHA256 ce79275b88d18315a95a5f044d7164f2f732e6f315c48e5e66c51541ee70882e
-MISC metadata.xml 281 RMD160 0f3a2d502d9cd7bebe47c038dbf658620be7c4d1 SHA1 16fedfcb2e56734bfa1eb19eaffeb3642e7ab358 SHA256 832410434385bce870d18cf5e5480d0862dfb21f1ecfa226de50378e43c07248
+AUX xharbour-as-needed.patch 5807 SHA256 6704203fb9449f7a55a14f82b7141a2a9049969f5729b1c23a14ef8ee9655d05 SHA512 0fcba2027c6384c65f8794c44ee4e7899fd96e99c7d6d72cbd8bbb884e572f10126fa9f848140e3abeb3e8629918ca168bccb9264779861d95f807c7488b106d WHIRLPOOL 964e7ae9c4c93fbe58ad75d2115f13a0e26f0f20a368684ccd44fa2e77035f259549e2aff9b4ac5870c843a1bd09852b509587d33ab4aad7b66bf99e1a8e80b4
+AUX xharbour-fPIC.patch 942 SHA256 7e6998d863950c0a2bf0f80ea9b031a7c3db81b6bbf311aad367762ad1a2e04b SHA512 77bcf2ac0bb2fcbb85b4322392b4b2c5cf57d187ac939bed172faaf67c24c3193e0994beb7ddca2e7198b031509e271fa5846becc4104320672c009a4ffaf914 WHIRLPOOL bd328c9e150ac61ff22cd1fbcc3c3afc3a7df10718bb2d80f88a14502b1af1f4f67a96f5f987583310bb7cca3540ef437eea7d372db644808da7937334495b3e
+AUX xharbour-mkinstdir.patch 386 SHA256 caef1428aa93c7e17460ef71016a599f31680b327cb448716c860f094b045f44 SHA512 794fe7fd657fb5ef31e54b293907ef921291f82404cc0bca05215b54636435779d5f984332bbd038f9818397febb607ca6849cd41a6efcc1b3dd71dbffd91f3a WHIRLPOOL d2a33e6ba5e582334abc94ed00fbcb2cd5b132ec1765ef81c568b6043e45deb22790933147e4a00b7bfb5451567ecfad0f13127e292bb4abe9b6eff7aef35e0c
+AUX xharbour-override-cc.patch 386 SHA256 34ff14823b720241cfcae5e99cadc834d8c6da21155f9134979d15e13ac62969 SHA512 b8a7d2ae9ef33444f6fdd00a192d0439ac0dff3f97e317721ffc634f8fbb0adef12b18633cfa543628553a30bc9527c4b69c675d3bc43a8966d56a0555ce7a54 WHIRLPOOL bda33e71585060a6c04ff01a775151c3b4b4d61bc86a1c742740f2688a4e6ba1f91b2080101b2ebd667aa2a94e3dddee77327d688898832238f6585c6545e7ce
+AUX xharbour-parallel-make.patch 3736 SHA256 b57b85917a0d962fea6ccc8d938318bce436dff62ec2081795f50c97935390b5 SHA512 a85eabced0bb80531c669be2f398303b814ea7e172be1777c2148a19a04369424d9c275f9375214d35aacf90a04703ef41ea3e4148c674003d12c28f6c14c8e9 WHIRLPOOL de00b4ec03cf7ed8edb30df60655bd1dae551aebf126cc92abc059d888dc1f5e8a68e7d22809c9b95e4acf983dd6ce6850477f04de2cdecce002347636100446
+AUX xharbour-skip-static-utils.patch 256 SHA256 4a0b6792b3126ff8fc24e00ebd15ea77de12542476d5990d3298f356e607d2a9 SHA512 29f862f4281fd3ec02b538f86c3beb87eb356d09f8a38aab03c6cb4f29d38fa84fd62861004fc8acfafb43de32648574c880eb20d476054edb446747ea5ea479 WHIRLPOOL ff1aad74080490ee62962bbdf0502fbeb49f4f5992fae01732f0b173a38b24574d5e98fc8f41b49976125151b004fa32cee8fd3ebe08f72c584a20dd556c1719
+DIST xharbour-1.2.1.src.tar.gz 4994334 SHA256 a4fbdec73c7433c6bceab03b8ce61701e7837fefd7afebf269319db3f8cc4896 SHA512 bedc1847e12c94247d0ce16c35a1f2bbf7fef86493a930cb13db021cbf4f0613ed4dc55eb5e13f3f3e3b619e7590dc64f117791e7c39a43066582d4f5d96cf80 WHIRLPOOL 0538c694a5c185242333b3393cd575c9801d69e3929fd16992b98701deac1656cb8393dc2db9e004bf11e5337de788b4b7ab2a818f85c1b9e07f3c4f1c341548
+EBUILD xharbour-1.2.1.ebuild 2656 SHA256 734e84533a0b826195d01d34ce02bb1ec13d7dd1ec93799953b67cf89a0651dd SHA512 362193faf8b846f4487fad9a97295f7f8f0e46bd5db906636c9bac704a7c655d3117b713933a9c6db2f4b13fcb15077b1e4c8f9c6f0df0264413f67618e17165 WHIRLPOOL 97ad302a39adee1906afefcfc59be6a5eecc6a860df1f941520ff1c68cc5866da6ccd110bb7afb7c8270c99ce37ba07351855af9e225eed67bcd4cd9b15041d2
+MISC ChangeLog 1337 SHA256 4ffe70706153b672ca4f9de3ed87cd04dacd08d5173eff6d73ac6e44169cb7b0 SHA512 47914271d7ec734ed008f2bf0cd3174f7928344792ecd70145de8d9ca87a9b490d84a6fe7c597b1453506603365fe138b8b304cfbf69a731908bbf8439778df4 WHIRLPOOL 3c2dc5482342f29dc9ca048b9a5a5a8be1863ee46fa0ad298fea0a036b32a94e3136df60882a2227d878c383dc02316f1bc26549ca53b202c389bdeb70dd1ac9
+MISC metadata.xml 281 SHA256 832410434385bce870d18cf5e5480d0862dfb21f1ecfa226de50378e43c07248 SHA512 9531c317e22375de45ccad4727ee90d42ecbbc39db344fb1558dccab791af0b89721f3a2d0dad79e2ed1b33ad49c40f3a373dd1b418346d1d7c785239c0bd3f1 WHIRLPOOL 8be44849764012b1bbd617897e2ad8f0aff20c20a0eb0a9e18c0b42d467d9613e805d11570cb24de5e2e47f30164f34522bc319a668c05ff9b9a2f2cd5443f02
diff --git a/dev-lang/xharbour/xharbour-1.0.0_beta1.ebuild b/dev-lang/xharbour/xharbour-1.2.1.ebuild
index 927e58e99..8c023b027 100644
--- a/dev-lang/xharbour/xharbour-1.0.0_beta1.ebuild
+++ b/dev-lang/xharbour/xharbour-1.2.1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
inherit base toolchain-funcs
-MY_P=${P/_/-}
DESCRIPTION="An extended implementation of the Clipper dialect of the xBase language family"
HOMEPAGE="http://www.xharbour.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.src.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
LICENSE="GPL-2-with-exceptions"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="allegro doc gpm odbc slang threads X"
+IUSE="allegro doc gpm slang threads X"
RDEPEND="sys-libs/ncurses
+ dev-db/unixODBC
allegro? ( media-libs/allegro )
gpm? ( sys-libs/gpm )
- odbc? ( dev-db/unixODBC )
slang? ( sys-libs/slang )
X? ( media-libs/freetype
x11-libs/libX11
@@ -28,17 +27,6 @@ RDEPEND="sys-libs/ncurses
DEPEND="${RDEPEND}
sys-devel/bison"
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-as-needed.patch
- "${FILESDIR}"/${PN}-fPIC.patch
- "${FILESDIR}"/${PN}-mkinstdir.patch
- "${FILESDIR}"/${PN}-override-cc.patch
- "${FILESDIR}"/${PN}-parallel-make.patch
- "${FILESDIR}"/${PN}-skip-static-utils.patch
-)
-
src_compile() {
# xHarbour uses environment vars to configure the build
export \
@@ -55,7 +43,7 @@ src_compile() {
HB_GT_LIB="gtstd" \
HB_MULTI_GT="yes" \
HB_COMMERCE="no"
- emake || die
+ emake -j1 || die
}
src_test() {