root
10 years ago
parent
0e78ba5c5a
commit
0c52229eef
@ -1 +1,2 @@
|
||||
DIST auctex-11.87.tar.gz 1206073 SHA256 63d57229e585dbf727f5545337615b997488bfdf475274da0718c90b77bd5cf2 SHA512 41a575a36ef2c111f214ad2e87a06c246751859a14ad3f8af77aaf180d8357a4c8d44c2f344b673404d2e011cdf4a193abda93f1b26ffff663f310ed430c5fa1 WHIRLPOOL d3bee56c1b940a2eb041a5b3b6e5ffe876b740e97c5793dd9295b42723abb5febd1fc40d9a0007df5d63f00547a5a59202eca2c102dfb878924ac07dac504eb0
|
||||
DIST auctex-11.88.tar.gz 1302836 SHA256 716867d5fbcc5c67cca781d7c1984e6a3a6d5da056ec3b4f35170805bf4dc83f SHA512 30c422b52b3fc698e453ada9643038dd30978f6b1a99f5118a53ae5b939d63246adcb1937f0e5c4cf166477dca78fa17d721402a90c833c9e91d75072ae0f67d WHIRLPOOL fa348913637bf6062184873f50c6988aa1afdd7e4a456acfb139d704de9769480503e796716a632e9769f7d3f68d70e6e42a739ae8742857fcf6390baec156d6
|
||||
|
||||
@ -0,0 +1,65 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emacs/auctex/auctex-11.88.ebuild,v 1.1 2014/11/01 16:45:58 ulm Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit elisp latex-package
|
||||
|
||||
DESCRIPTION="Extended support for writing, formatting and using (La)TeX, Texinfo and BibTeX files"
|
||||
HOMEPAGE="http://www.gnu.org/software/auctex/"
|
||||
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+ FDL-1.3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
|
||||
IUSE="preview-latex"
|
||||
|
||||
DEPEND="virtual/latex-base
|
||||
preview-latex? (
|
||||
app-text/dvipng
|
||||
app-text/ghostscript-gpl
|
||||
)"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
TEXMF="/usr/share/texmf-site"
|
||||
|
||||
src_prepare() {
|
||||
elisp_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
EMACS_NAME=emacs EMACS_FLAVOR=emacs econf --disable-build-dir-test \
|
||||
--with-auto-dir="${EPREFIX}/var/lib/auctex" \
|
||||
--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
|
||||
--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
|
||||
--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
|
||||
--with-texmf-dir="${EPREFIX}${TEXMF}" \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
|
||||
$(use_enable preview-latex preview)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}"/fonts
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -j1 DESTDIR="${D}" install
|
||||
elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
|
||||
if use preview-latex; then
|
||||
elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
|
||||
fi
|
||||
dodoc ChangeLog CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# rebuild TeX-inputfiles-database
|
||||
use preview-latex && latex-package_pkg_postinst
|
||||
elisp-site-regen
|
||||
}
|
||||
|
||||
pkg_postrm(){
|
||||
use preview-latex && latex-package_pkg_postrm
|
||||
elisp-site-regen
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST jre-7u51-linux-i586.tar.gz 48333427 SHA256 f6807069ff45576ffff173a2ee4355bdf5a493e9b463bde9196b942af4f6fcdb SHA512 e5a2d841e7f924b606d3d3e94f75bad273f9952ff94b94f081d73614d0001326a9ac974412840c994e66dcc5d2bf582c193a08cb725f435f2770fb01d9546b3a WHIRLPOOL 5cf27c761ea3c2c8ad395dcb8563dc5e4933552a48d1e64e77071bf84e86bd34aa19f590859a143a9c986fda0b7594f4ef6e27d89fcaef0c52a678bd30a6eaa0
|
||||
DIST jre-7u55-linux-i586.tar.gz 48340455 SHA256 fa674c83c25a65edeca289321c9bb1c0fe9c0eaae64dc1bf3409e2c6a5f46c80 SHA512 f365a2548ea6ff9cf263b0dd71100eb70d842a4abd72d852e7698d9d7dbee97c4da2654795035adbc4519705a3d7eb81031566f2a97eaeeadaa439ca9a8867fa WHIRLPOOL 88abacb65259fd59c89a70e72ff0a258f6b0b178afa826502eb46e7109abe586094d79762148b14c1d97dce2d1b3a9e06736a92d82c839ef2fe8c8e8310918b5
|
||||
DIST jre-7u67-linux-i586.tar.gz 48426207 SHA256 eadec83a54d3a9d09248a8d16b21c03da9afffc7317e775fb8db962620a0781d SHA512 51532bcfc0275aabbfd5f2584f023915acad61f7825c95253a4c38ea35e40fa65cffa0f49feb613ce7470e92a4dae610fcb0d77e006a975b392e478d28d01917 WHIRLPOOL 2275a20c83d32b5ae8c2178a566226a8cc95a594ae726d5a76e6a0c4000e91dd9a770c6b76a11a76f076e7689d16d7263b5e0351391922ef05fe9ed5d73c81bc
|
||||
DIST jre-7u71-linux-i586.tar.gz 48461842 SHA256 b616145b22aafd53433bef76c873d50c4557469d15fc14bd852885cc4fa2947d SHA512 6d63fbcf2601660bb57c8496c024a5186ac41ef6fe96f8eb36e089a2a80bac4c26c43e356417e8ac7568685df005bda0fa4c74033e6501718ca90277ab75137e WHIRLPOOL 804ca029a0d4d8d345eba9f8924735bb82f74d47098f0ff876a4104c005bad2b2e69ba1585f7c11ebba43e4923bea7f85a8061902ce72a04b2df6acb411d3cdf
|
||||
|
||||
@ -0,0 +1,129 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.71.ebuild,v 1.3 2014/11/01 17:00:53 ago Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit java-vm-2 eutils prefix versionator
|
||||
|
||||
# This URIs need to be updated when bumping!
|
||||
JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html"
|
||||
|
||||
MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
|
||||
S_PV="$(replace_version_separator 3 '_')"
|
||||
|
||||
X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
|
||||
|
||||
DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)"
|
||||
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
|
||||
SRC_URI="${X86_AT}"
|
||||
|
||||
LICENSE="Oracle-BCLA-JavaSE"
|
||||
SLOT="1.7"
|
||||
KEYWORDS="-* amd64"
|
||||
IUSE="+X alsa nsplugin pax_kernel"
|
||||
|
||||
RESTRICT="fetch strip"
|
||||
QA_PREBUILT="*"
|
||||
|
||||
RDEPEND="
|
||||
|| (
|
||||
(
|
||||
X? (
|
||||
x11-libs/libXext[abi_x86_32(-)]
|
||||
x11-libs/libXi[abi_x86_32(-)]
|
||||
x11-libs/libXrender[abi_x86_32(-)]
|
||||
x11-libs/libXtst[abi_x86_32(-)]
|
||||
x11-libs/libX11[abi_x86_32(-)] )
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] )
|
||||
)
|
||||
(
|
||||
X? ( app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
|
||||
alsa? ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
|
||||
# marking. #427642
|
||||
DEPEND="
|
||||
pax_kernel? ( sys-apps/paxctl )"
|
||||
|
||||
S="${WORKDIR}/jre${S_PV}"
|
||||
|
||||
pkg_nofetch() {
|
||||
einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again."
|
||||
einfo ""
|
||||
einfo "Please download '${X86_AT}' from:"
|
||||
einfo "'${JRE_URI}'"
|
||||
einfo "and move it to '${DISTDIR}'"
|
||||
einfo
|
||||
einfo "If the above mentioned urls do not point to the correct version anymore,"
|
||||
einfo "please download the files from Oracle's java download archive:"
|
||||
einfo
|
||||
einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jre-${MY_PV}-oth-JPR"
|
||||
einfo
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# This needs to be done before CDS - #215225
|
||||
java-vm_set-pax-markings "${S}"
|
||||
|
||||
# see bug #207282
|
||||
einfo "Creating the Class Data Sharing archives"
|
||||
bin/java -client -Xshare:dump || die
|
||||
bin/java -server -Xshare:dump || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/opt/${P}"
|
||||
local ddest="${ED}${dest}"
|
||||
|
||||
# We should not need the ancient plugin for Firefox 2 anymore, plus it has
|
||||
# writable executable segments
|
||||
rm -vf lib/i386/libjavaplugin_oji.so \
|
||||
lib/i386/libjavaplugin_nscp*.so
|
||||
rm -vrf plugin/i386
|
||||
# Without nsplugin flag, also remove the new plugin
|
||||
arch=i386;
|
||||
if ! use nsplugin; then
|
||||
rm -vf lib/${arch}/libnpjp2.so \
|
||||
lib/${arch}/libjavaplugin_jni.so
|
||||
fi
|
||||
|
||||
dodir "${dest}"
|
||||
cp -pPR bin lib man "${ddest}" || die
|
||||
|
||||
# Remove empty dirs we might have copied
|
||||
find "${D}" -type d -empty -exec rmdir {} + || die
|
||||
|
||||
dodoc COPYRIGHT README
|
||||
|
||||
if use nsplugin; then
|
||||
install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
|
||||
fi
|
||||
|
||||
# Install desktop file for the Java Control Panel.
|
||||
# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
|
||||
# make_desktop_entry can't be used as ${P} would end up in filename.
|
||||
newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
|
||||
sun-jcontrol-${PN}-${SLOT}.png || die
|
||||
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \
|
||||
-e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \
|
||||
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
|
||||
-e "s#Application;##" \
|
||||
-e "/Encoding/d" \
|
||||
lib/desktop/applications/sun_java.desktop > \
|
||||
"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
|
||||
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
|
||||
|
||||
# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html
|
||||
rm "${ddest}"/lib/fontconfig.* || die
|
||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
|
||||
eprefixify "${T}"/fontconfig.properties
|
||||
insinto "${dest}"/lib/
|
||||
doins "${T}"/fontconfig.properties
|
||||
|
||||
set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
|
||||
java-vm_revdep-mask
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/tests/test_prefs.py b/tests/test_prefs.py
|
||||
index d1bb438..e568939 100644
|
||||
--- a/tests/test_prefs.py
|
||||
+++ b/tests/test_prefs.py
|
||||
@@ -37,6 +37,7 @@ class PrefsTestCase(unittest.TestCase):
|
||||
except ET.ParseError as e:
|
||||
raise AssertionError(e)
|
||||
|
||||
+ @unittest.skip("Importing Gtk doesn't raise a RuntimeError on recent Fedora")
|
||||
def test_ui_file_is_valid_gtk_builder(self):
|
||||
try:
|
||||
from gi.repository import Gtk
|
||||
@ -0,0 +1,39 @@
|
||||
Gentoo-bug: https://bugs.gentoo.org/527118
|
||||
--- a/m4.include/mc-with-screen-ncurses.m4
|
||||
+++ b/m4.include/mc-with-screen-ncurses.m4
|
||||
@@ -101,6 +101,9 @@
|
||||
LIBS=
|
||||
AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"],
|
||||
[AC_MSG_ERROR([Cannot find ncurses library])])
|
||||
+ AC_SEARCH_LIBS([stdscr],[tinfo ncurses],[MCLIBS="$MCLIBS $LIBS"],
|
||||
+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
|
||||
+
|
||||
|
||||
screen_type=ncurses
|
||||
screen_msg="Ncurses library"
|
||||
@@ -111,10 +114,15 @@
|
||||
AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
|
||||
[AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
|
||||
|
||||
+ AC_SEARCH_LIBS([stdscr],[tinfo ncursesw ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
|
||||
+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
|
||||
+
|
||||
if test x"$ncursesw_found" = "x"; then
|
||||
LIBS=
|
||||
AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"],
|
||||
[AC_MSG_ERROR([Cannot find ncurses library])])
|
||||
+ AC_SEARCH_LIBS([stdscr],[tinfo ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
|
||||
+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
|
||||
fi
|
||||
|
||||
dnl Check the header
|
||||
@@ -166,6 +174,9 @@
|
||||
LIBS=
|
||||
AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
|
||||
[AC_MSG_ERROR([Cannot find ncursesw library])])
|
||||
+ AC_SEARCH_LIBS([stdscr],[tinfow ncursesw],[MCLIBS="$MCLIBS $LIBS"],
|
||||
+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
|
||||
+
|
||||
|
||||
dnl Check the header
|
||||
ncurses_h_found=
|
||||
@ -1,3 +1,2 @@
|
||||
DIST gtg-0.2.4.tar.gz 598293 SHA256 8dcadc0d13acc50d6fab3c7627b5a5068d74ffbf50f5fb595edec8de01974911 SHA512 f668becf901f26254280335121f490d6474c47c31d97f32e28f108d6584f0efe49fdfcb9a1f317068a79078890f93f818792b8ad63e6d200bf29230ab58773f5 WHIRLPOOL df5aaf1b5f26102844ca93a918c4d48e848c79e71217494d94167ab78d8fb8ab4a65ec146b47e9102e8a0053f3088c9ccccfc1b5ea11f87c4eaff3e326d53770
|
||||
DIST gtg-0.2.5.tar.gz 604031 SHA256 e6a7504b3a780cee7a6374980336dce01d70b0e920ceb00e0649457a00fab94e SHA512 86d45373fa93cf7fbde4cbd94012091de4e7e059c65a2a678e232ee9f55f71ce7091f01a4616ecdda33a4caeba7c6ee1328b720da4e2aec30fbab0fdcbb5ece3 WHIRLPOOL 25cebbdd7e5d6b48be7930843c19061eecc154e830cf2ccb6e788e76894afc9ea9d244b2cd4272b64bcf10ab4eb0d6b03b575c6e8a02d1f23d843bdbcaf4a7e8
|
||||
DIST gtg-0.3.1.tar.gz 7902244 SHA256 57ceb3fa15298b69ce64cdd0a0a35ef3f4fd1151458ddff21f26a288cc02a0a7 SHA512 7d342971cd98fbe5b84ec2f2b4c918dd668d00699b6f0afb76b143acdbe79807525bcc02d2e189769c24de5a8b33d7eef4ce242e3c091fe09505daac55158f12 WHIRLPOOL 3d90cf709cfe15e0a303b0caea7c1102cf4e9c31441be7a390b8be32f34a20059bc3ff9b422bada593364b22047f95a2eb58c6a558c5f5f8f8af7f534db8fc5b
|
||||
DIST gtg-0.3.tar.gz 4692580 SHA256 7c55a2eb1e6a552ece4c023f92ebec85661d514e4035ff5e2bcfc1c56ec4e2bc SHA512 0d36a1fabc23457057ef8c5f3b6f945f317c0d840f5a63ebc50fba0a5823c729e5765b531a95f71acb4364cae373420fded6ce04958bd4f8b44669a43dc22191 WHIRLPOOL 9c95218b8e882637ed9b6b8017e1c67cea2521d08aa63cf1bcdd0f499b0b296784b077cce4447354913dff9958071aa91c792f003f42bac237b72318afb26909
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
diff --git a/GTG/plugins/hamster/hamster.py b/GTG/plugins/hamster/hamster.py
|
||||
index b4e2208..046fd10 100755
|
||||
--- a/GTG/plugins/hamster/hamster.py
|
||||
+++ b/GTG/plugins/hamster/hamster.py
|
||||
@@ -65,16 +65,19 @@ class hamsterPlugin:
|
||||
hamster_activities=dict([(unicode(x[0]), unicode(x[1])) for x in self.hamster.GetActivities()])
|
||||
if (gtg_title in hamster_activities
|
||||
or gtg_title.replace(",", "") in hamster_activities):
|
||||
- category = "@%s" % hamster_activities[gtg_title]
|
||||
+ category = "%s" % hamster_activities[gtg_title]
|
||||
|
||||
if (self.preferences['category'] == 'tag' or
|
||||
(self.preferences['category'] == 'auto_tag' and not category)):
|
||||
# See if any of the tags match existing categories
|
||||
- categories = dict([(unicode(x).lower(), unicode(x)) for x in self.hamster.GetCategories()])
|
||||
+ categories = dict([(unicode(x[1]).lower(), unicode(x[1])) for x in self.hamster.GetCategories()])
|
||||
intersection = set(categories.keys()).intersection(set([x.lower() for x in gtg_tags]))
|
||||
if len(intersection) > 0:
|
||||
- category = "@%s" % categories[intersection.pop()]
|
||||
-
|
||||
+ category = "%s" % categories[intersection.pop()]
|
||||
+ else:
|
||||
+ # Force category if not found
|
||||
+ category = gtg_tags[0]
|
||||
+
|
||||
description = ""
|
||||
if self.preferences['description'] == 'title':
|
||||
description = gtg_title
|
||||
@@ -91,10 +94,10 @@ class hamsterPlugin:
|
||||
except dbus.exceptions.DBusException:
|
||||
# old hamster version, doesn't support tags
|
||||
pass
|
||||
- tag_str = "".join([" #" + x for x in tag_candidates])
|
||||
+ tag_str = "".join([", " + x for x in tag_candidates])
|
||||
|
||||
#print '%s%s,%s%s'%(activity, category, description, tag_str)
|
||||
- hamster_id=self.hamster.AddFact('%s%s,%s%s'%(activity, category, description, tag_str), 0, 0)
|
||||
+ hamster_id=self.hamster.AddFact(activity, tag_str, 0, 0, category, description, False)
|
||||
|
||||
ids=self.get_hamster_ids(task)
|
||||
ids.append(str(hamster_id))
|
||||
@ -0,0 +1,13 @@
|
||||
Fix desktop-file-validate warning.
|
||||
|
||||
--- a/gtg.desktop 2014-11-01 11:23:31.101881704 +0100
|
||||
+++ b/gtg.desktop 2014-11-01 11:23:37.349775014 +0100
|
||||
@@ -14,7 +14,7 @@
|
||||
StartupNotify=true
|
||||
X-Ayatana-Desktop-Shortcuts=NewTask
|
||||
|
||||
-[NewTask Shortcut Group]
|
||||
+[X-NewTask Shortcut Group]
|
||||
Name=New Task
|
||||
Exec=gtg_new_task
|
||||
TargetEnvironment=Unity
|
||||
@ -0,0 +1,20 @@
|
||||
Do not install unwanted locales.
|
||||
|
||||
--- a/setup.py 2014-11-01 11:21:49.679613605 +0100
|
||||
+++ b/setup.py 2014-11-01 11:26:36.305719135 +0100
|
||||
@@ -101,9 +101,15 @@
|
||||
|
||||
PO_DIR = 'po'
|
||||
MO_DIR = os.path.join('build', 'po')
|
||||
+LINGUAS = os.environ.get('LINGUAS', '*').split(' ')
|
||||
|
||||
for po in glob.glob(os.path.join(PO_DIR, '*.po')):
|
||||
lang = os.path.basename(po[:-3])
|
||||
+
|
||||
+ # Skip unwanted locales
|
||||
+ if lang not in LINGUAS and '*' not in LINGUAS:
|
||||
+ continue
|
||||
+
|
||||
mo = os.path.join(MO_DIR, lang, 'gtg.mo')
|
||||
target_dir = os.path.dirname(mo)
|
||||
if not os.path.isdir(target_dir):
|
||||
@ -1,55 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/gtg/gtg-0.2.4-r1.ebuild,v 1.4 2011/10/23 22:02:52 tetromino Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
PYTHON_DEPEND="2:2.6"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
|
||||
|
||||
inherit eutils fdo-mime gnome2-utils distutils
|
||||
|
||||
DESCRIPTION="Personal organizer for the GNOME desktop environment"
|
||||
HOMEPAGE="http://gtg.fritalk.com/"
|
||||
SRC_URI="http://launchpad.net/${PN}/${PV:0:3}/${PV}/+download/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-python/configobj
|
||||
dev-python/dbus-python
|
||||
dev-python/pycairo
|
||||
dev-python/pygobject:2
|
||||
dev-python/pygtk
|
||||
dev-python/pyxdg
|
||||
dev-python/simplejson"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-hamster.patch
|
||||
distutils_src_prepare
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
distutils_pkg_postinst
|
||||
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
distutils_pkg_postrm
|
||||
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/gtg/gtg-0.2.5.ebuild,v 1.1 2012/01/28 21:16:06 steev Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
PYTHON_DEPEND="2:2.6"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
|
||||
|
||||
inherit eutils fdo-mime gnome2-utils distutils
|
||||
|
||||
DESCRIPTION="Personal organizer for the GNOME desktop environment"
|
||||
HOMEPAGE="http://gtg.fritalk.com/"
|
||||
SRC_URI="http://launchpad.net/${PN}/${PV:0:3}/${PV}/+download/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-python/configobj
|
||||
dev-python/dbus-python
|
||||
dev-python/pycairo
|
||||
dev-python/pygobject:2
|
||||
dev-python/pygtk
|
||||
dev-python/pyxdg
|
||||
dev-python/simplejson"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
# This is already fixed in trunk, not in 0.2.5
|
||||
epatch "${FILESDIR}"/${PN}-0.2.4-hamster.patch
|
||||
distutils_src_prepare
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
distutils_pkg_postinst
|
||||
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
distutils_pkg_postrm
|
||||
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/gtg/gtg-0.3.1.ebuild,v 1.1 2014/11/01 10:44:45 eva Exp $
|
||||
|
||||
EAPI="5"
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit eutils fdo-mime gnome2-utils distutils-r1 versionator
|
||||
|
||||
MY_PV="$(get_version_component_range 1-2)"
|
||||
DESCRIPTION="Personal organizer for the GNOME desktop environment"
|
||||
HOMEPAGE="http://gtgnome.net/"
|
||||
SRC_URI="http://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-python/configobj[${PYTHON_USEDEP}]
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
dev-python/liblarch[${PYTHON_USEDEP}]
|
||||
dev-python/notify-python[${PYTHON_USEDEP}]
|
||||
dev-python/pycairo[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:2[${PYTHON_USEDEP}]
|
||||
dev-python/pygtk[${PYTHON_USEDEP}]
|
||||
dev-python/python-dateutil[${PYTHON_USEDEP}]
|
||||
dev-python/pyxdg[${PYTHON_USEDEP}]
|
||||
dev-python/simplejson[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
python_prepare_all() {
|
||||
# Plugins are voluntarily left automagic as application has a nice way
|
||||
# to suggest missing dependencies. We only remove the ones that cannot
|
||||
# work on gentoo.
|
||||
# Backends should be enabled via USE flag when pulling extra deps
|
||||
|
||||
# geoloc: uses removed from tree bindings
|
||||
sed -e "/GTG.plugins.geolocalized_tasks',/d" \
|
||||
-e "/geolocalized-tasks.gtg-plugin/d" \
|
||||
-i setup.py || die
|
||||
|
||||
# launchpad: missing dependency
|
||||
# evolution: missing python-r1 support
|
||||
rm GTG/backends/backend_launchpad.py \
|
||||
GTG/backends/backend_evolution.py \
|
||||
|| die
|
||||
|
||||
# Respect LINGUAS
|
||||
epatch "${FILESDIR}"/${PN}-0.3.1-locales.patch
|
||||
|
||||
# Fix validation warning
|
||||
epatch "${FILESDIR}"/${PN}-0.3.1-desktop.patch
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
fdo-mime_mime_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -0,0 +1,62 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.8.1-r1.ebuild,v 1.1 2014/10/31 19:25:38 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit autotools eutils flag-o-matic toolchain-funcs
|
||||
|
||||
DEB_PV=${PV%.*}
|
||||
DEB_PATCH=${PV##*.}
|
||||
DEB_PF="${PN}_${DEB_PV}-${DEB_PATCH}"
|
||||
MY_P="${PN}-${DEB_PV}"
|
||||
|
||||
DESCRIPTION="DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant"
|
||||
HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
|
||||
SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
|
||||
mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="libedit static"
|
||||
|
||||
RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${WORKDIR}"/${DEB_PF}.diff
|
||||
epatch */debian/diff/*
|
||||
epatch "${FILESDIR}"/${PN}-0.5.5.1-octal.patch #337329
|
||||
epatch "${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.patch
|
||||
|
||||
# Fix the invalid sort
|
||||
sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
|
||||
|
||||
# Use pkg-config for libedit linkage
|
||||
sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" configure.ac
|
||||
|
||||
# May as well, as the debian patches force this anyway
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use static && append-ldflags -static
|
||||
# Do not pass --enable-glob due to #443552.
|
||||
# Autotools use $LINENO as a proxy for extended debug support
|
||||
# (i.e. they're running bash), so disable that. #527644
|
||||
econf \
|
||||
--bindir="${EPREFIX}"/bin \
|
||||
--enable-fnmatch \
|
||||
--disable-lineno \
|
||||
$(use_with libedit)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc */debian/changelog
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
fix one of the Debian patches -- it uses warnx but doesn't include err.h.
|
||||
|
||||
--- a/src/eval.c
|
||||
+++ b/src/eval.c
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
+#include <err.h>
|
||||
|
||||
/*
|
||||
* Evaluate a command.
|
||||
@ -1 +1,2 @@
|
||||
DIST gitgutter-20140525.tar.bz2 30711 SHA256 b04ac418847ebdb0e55f69259fbdef0de7afa6eab1172844213d6c9e63fd2444 SHA512 00f074d0ba0a008969664ec0ff2e19f92600d8271118c7780cf678843ca729641088ddb9509fc37667521a8770672429b5bf7068e633f82b1358d7e9c1fef978 WHIRLPOOL c364ea0146738b6056f59a9e91f916a746f811da8d5093ef65e5f58b4f47c2a12b6e2815055a2cf65b57a5123e65daf4718e095a115d6dffae4a692b86b3f73a
|
||||
DIST gitgutter-20141101.tar.bz2 31556 SHA256 a7d65fe668e8e7a515a8637df7ed80b17f27a0f637a7882c0207f8bae035022f SHA512 cbe21df40a05caebd85ac24fd20a55cf784ff33f73a7d27bcb8e87b6a38cd787b801fa314bf7ba9eefbc703efff527c9ebd947768c5714e774e39e67c7d35055 WHIRLPOOL 92d4c59d1e3925afa7f93f30ce8f87c430bf556e9553601b8eaeeaa9538900899115309602b1a5c17e8be9cff9d5b69a0ae70470438841a7090aaa35f452bbd2
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/gitgutter/gitgutter-20141101.ebuild,v 1.1 2014/11/01 08:30:26 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: shows a git diff summary in the sign column and stages/reverts individual hunks"
|
||||
HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
LICENSE="MIT"
|
||||
VIM_PLUGIN_HELPFILES="${PN}.txt"
|
||||
|
||||
src_prepare() {
|
||||
rm README* screenshot.png || die
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST securemodelines-20080424.tar.bz2 1544 SHA256 1507d674d1e2cfd521db898ecd798245b3efa902ac5e585f92d22496b2379d7d SHA512 d8807b5dc2c55011c8510ef685df90360ccadc30fc90f297961be60eebee571f98ac5b2f8864f08a544529e7265c77c63291871940555daceb28d35820e5fa96 WHIRLPOOL a004f694022f0c1b9d33be667d1e3aa1345d98b661d3855e82c2d8a84a10899f7feffd9508f3fc79e630b9af42c3aac79efbfbb00b67ce0411b60fefbbf0e5ab
|
||||
DIST securemodelines-20140926.tar.bz2 1562 SHA256 57912489453596a3fceaffd8cc59c15cbf5f0b861a48add77e9c3f8649bb7947 SHA512 15a948781751998d832f445e7c3ad936e5c034fcc9936d977c5cf05215dd541a235fc066f7e774b151fac2afb2b0a59665d13f6f981cc59d4e1135f06f6cdc35 WHIRLPOOL e731692ef7c8bb25f3fb1bb936b94c140e57223f5904d3de685440bf1bba9b1ae0fc8bf2ca57cf2e732edb85233b4d15bf97bbbac550c02c621f62f4db007cc7
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/securemodelines/securemodelines-20140926.ebuild,v 1.2 2014/11/01 09:41:52 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: secure, user-configurable modeline support"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines"
|
||||
LICENSE="vim"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
|
||||
|
||||
VIM_PLUGIN_HELPTEXT="Make sure that you disable vim's builtin modeline support if you have
|
||||
enabled it in your .vimrc."
|
||||
@ -0,0 +1 @@
|
||||
DIST sudoedit-0.20.tar.bz2 11420 SHA256 a9b274e38025e21bc7be430878e8bf1f1a131620236de397f8a99cd651d72384 SHA512 963815cd9c41b54bf1a3aee259460565f4cfe6d5f9d32b5b9986026e2666e1913c89a59706aafc604dbad433d706e4a9cbf533cc7bfe978eb9a0de2194540ebf WHIRLPOOL b6eac2b628252a576656fd0101b7a2afee29acc4c2ca09b535f7320fe13c0408a9c4e415b5cb7a36966b6a95c43d28907302c00c5103994f6debc996338ad25a
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>php</herd>
|
||||
<herd>vim</herd>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,19 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-vim/sudoedit/sudoedit-0.20.ebuild,v 1.1 2014/11/01 09:23:21 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: edit files using sudo or su"
|
||||
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2709 https://github.com/chrisbra/SudoEdit.vim"
|
||||
LICENSE="vim"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
VIM_PLUGIN_HELPFILES="SudoEdit.txt"
|
||||
|
||||
RDEPEND="|| ( app-admin/sudo sys-apps/shadow )"
|
||||
|
||||
src_prepare() {
|
||||
# remove unused windows related file
|
||||
rm autoload/sudo.cmd || die
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff -Naur a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
|
||||
--- a/src/bin/pg_ctl/pg_ctl.c 2011-04-14 23:18:15 -0400
|
||||
+++ b/src/bin/pg_ctl/pg_ctl.c 2011-08-01 19:44:54 -0400
|
||||
@@ -975,7 +975,7 @@
|
||||
}
|
||||
}
|
||||
printf(_("%s: no server running\n"), progname);
|
||||
- exit(1);
|
||||
+ exit(3);
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,135 @@
|
||||
diff -Naur a/contrib/Makefile b/contrib/Makefile
|
||||
--- a/contrib/Makefile 2011-02-02 07:37:16.654175660 -0500
|
||||
+++ b/contrib/Makefile 2011-02-08 05:54:00.145582001 -0500
|
||||
@@ -5,51 +5,10 @@
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
SUBDIRS = \
|
||||
- adminpack \
|
||||
- auto_explain \
|
||||
- btree_gin \
|
||||
- btree_gist \
|
||||
- chkpass \
|
||||
- citext \
|
||||
- cube \
|
||||
- dblink \
|
||||
- dict_int \
|
||||
- dict_xsyn \
|
||||
- earthdistance \
|
||||
- fuzzystrmatch \
|
||||
- hstore \
|
||||
- intagg \
|
||||
- intarray \
|
||||
- isn \
|
||||
- lo \
|
||||
- ltree \
|
||||
oid2name \
|
||||
- pageinspect \
|
||||
- passwordcheck \
|
||||
- pg_archivecleanup \
|
||||
- pg_buffercache \
|
||||
- pg_freespacemap \
|
||||
- pg_standby \
|
||||
- pg_stat_statements \
|
||||
- pg_trgm \
|
||||
- pg_upgrade \
|
||||
- pg_upgrade_support \
|
||||
pgbench \
|
||||
- pgcrypto \
|
||||
- pgrowlocks \
|
||||
- pgstattuple \
|
||||
- seg \
|
||||
- spi \
|
||||
- tablefunc \
|
||||
- test_parser \
|
||||
- tsearch2 \
|
||||
- unaccent \
|
||||
vacuumlo
|
||||
|
||||
-ifeq ($(with_openssl),yes)
|
||||
-SUBDIRS += sslinfo
|
||||
-endif
|
||||
-
|
||||
ifeq ($(with_ossp_uuid),yes)
|
||||
SUBDIRS += uuid-ossp
|
||||
endif
|
||||
diff -Naur a/src/backend/Makefile b/src/backend/Makefile
|
||||
--- a/src/backend/Makefile 2011-02-02 07:37:56.403870592 -0500
|
||||
+++ b/src/backend/Makefile 2011-02-08 05:57:26.078497002 -0500
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
|
||||
+all: someheaders
|
||||
|
||||
ifneq ($(PORTNAME), cygwin)
|
||||
ifneq ($(PORTNAME), win32)
|
||||
@@ -114,7 +114,7 @@
|
||||
endif # aix
|
||||
|
||||
# Update the commonly used headers before building the subdirectories
|
||||
-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
|
||||
+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
|
||||
|
||||
# run this unconditionally to avoid needing to know its dependencies here:
|
||||
submake-schemapg:
|
||||
@@ -191,23 +191,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-install: all installdirs install-bin
|
||||
-ifeq ($(PORTNAME), cygwin)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
-ifeq ($(PORTNAME), win32)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
- $(MAKE) -C catalog install-data
|
||||
- $(MAKE) -C tsearch install-data
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
|
||||
+install:
|
||||
|
||||
install-bin: postgres $(POSTGRES_IMP) installdirs
|
||||
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
|
||||
diff -Naur a/src/bin/Makefile b/src/bin/Makefile
|
||||
--- a/src/bin/Makefile 2011-02-02 07:38:35.133570047 -0500
|
||||
+++ b/src/bin/Makefile 2011-02-08 05:58:48.819847001 -0500
|
||||
@@ -13,8 +13,7 @@
|
||||
top_builddir = ../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
-SUBDIRS = initdb pg_ctl pg_dump \
|
||||
- psql scripts pg_config pg_controldata pg_resetxlog
|
||||
+SUBDIRS = pg_dump psql scripts pg_config
|
||||
ifeq ($(PORTNAME), win32)
|
||||
SUBDIRS+=pgevent
|
||||
endif
|
||||
diff -Naur a/src/Makefile b/src/Makefile
|
||||
--- a/src/Makefile 2011-02-02 07:37:56.283870942 -0500
|
||||
+++ b/src/Makefile 2011-02-08 06:00:51.591202002 -0500
|
||||
@@ -15,17 +15,11 @@
|
||||
|
||||
all install installdirs uninstall distprep:
|
||||
$(MAKE) -C port $@
|
||||
- $(MAKE) -C timezone $@
|
||||
$(MAKE) -C backend $@
|
||||
- $(MAKE) -C backend/utils/mb/conversion_procs $@
|
||||
- $(MAKE) -C backend/snowball $@
|
||||
$(MAKE) -C include $@
|
||||
$(MAKE) -C interfaces $@
|
||||
- $(MAKE) -C backend/replication/libpqwalreceiver $@
|
||||
$(MAKE) -C bin $@
|
||||
- $(MAKE) -C pl $@
|
||||
$(MAKE) -C makefiles $@
|
||||
- $(MAKE) -C test/regress $@
|
||||
|
||||
install: install-local
|
||||
|
||||
@ -0,0 +1,141 @@
|
||||
diff -Naur a/contrib/Makefile b/contrib/Makefile
|
||||
--- a/contrib/Makefile 2011-09-08 17:13:27.000000000 -0400
|
||||
+++ b/contrib/Makefile 2011-09-16 21:58:34.080579316 -0400
|
||||
@@ -5,56 +5,10 @@
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
SUBDIRS = \
|
||||
- adminpack \
|
||||
- auth_delay \
|
||||
- auto_explain \
|
||||
- btree_gin \
|
||||
- btree_gist \
|
||||
- chkpass \
|
||||
- citext \
|
||||
- cube \
|
||||
- dblink \
|
||||
- dict_int \
|
||||
- dict_xsyn \
|
||||
- dummy_seclabel \
|
||||
- earthdistance \
|
||||
- file_fdw \
|
||||
- fuzzystrmatch \
|
||||
- hstore \
|
||||
- intagg \
|
||||
- intarray \
|
||||
- isn \
|
||||
- lo \
|
||||
- ltree \
|
||||
oid2name \
|
||||
- pageinspect \
|
||||
- passwordcheck \
|
||||
- pg_archivecleanup \
|
||||
- pg_buffercache \
|
||||
- pg_freespacemap \
|
||||
- pg_standby \
|
||||
- pg_stat_statements \
|
||||
- pg_test_fsync \
|
||||
- pg_trgm \
|
||||
- pg_upgrade \
|
||||
- pg_upgrade_support \
|
||||
pgbench \
|
||||
- pgcrypto \
|
||||
- pgrowlocks \
|
||||
- pgstattuple \
|
||||
- seg \
|
||||
- spi \
|
||||
- tablefunc \
|
||||
- test_parser \
|
||||
- tsearch2 \
|
||||
- unaccent \
|
||||
vacuumlo
|
||||
|
||||
-ifeq ($(with_openssl),yes)
|
||||
-SUBDIRS += sslinfo
|
||||
-else
|
||||
-ALWAYS_SUBDIRS += sslinfo
|
||||
-endif
|
||||
|
||||
ifeq ($(with_ossp_uuid),yes)
|
||||
SUBDIRS += uuid-ossp
|
||||
diff -Naur a/src/backend/Makefile b/src/backend/Makefile
|
||||
--- a/src/backend/Makefile 2011-09-08 17:13:27.000000000 -0400
|
||||
+++ b/src/backend/Makefile 2011-09-16 22:01:48.400579314 -0400
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
|
||||
+all: someheaders
|
||||
|
||||
ifneq ($(PORTNAME), cygwin)
|
||||
ifneq ($(PORTNAME), win32)
|
||||
@@ -114,7 +114,7 @@
|
||||
endif # aix
|
||||
|
||||
# Update the commonly used headers before building the subdirectories
|
||||
-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
|
||||
# run this unconditionally to avoid needing to know its dependencies here:
|
||||
submake-schemapg:
|
||||
@@ -206,23 +206,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-install: all installdirs install-bin
|
||||
-ifeq ($(PORTNAME), cygwin)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
-ifeq ($(PORTNAME), win32)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
- $(MAKE) -C catalog install-data
|
||||
- $(MAKE) -C tsearch install-data
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
|
||||
+install:
|
||||
|
||||
install-bin: postgres $(POSTGRES_IMP) installdirs
|
||||
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
|
||||
diff -Naur a/src/bin/Makefile b/src/bin/Makefile
|
||||
--- a/src/bin/Makefile 2011-09-08 17:13:27.000000000 -0400
|
||||
+++ b/src/bin/Makefile 2011-09-16 22:03:48.250579314 -0400
|
||||
@@ -13,8 +13,7 @@
|
||||
top_builddir = ../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
-SUBDIRS = initdb pg_ctl pg_dump \
|
||||
- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
|
||||
+SUBDIRS = pg_dump psql scripts pg_config
|
||||
|
||||
ifeq ($(PORTNAME), win32)
|
||||
SUBDIRS += pgevent
|
||||
diff -Naur a/src/Makefile b/src/Makefile
|
||||
--- a/src/Makefile 2011-09-08 17:13:27.000000000 -0400
|
||||
+++ b/src/Makefile 2011-09-16 22:29:17.650579302 -0400
|
||||
@@ -14,17 +14,11 @@
|
||||
|
||||
SUBDIRS = \
|
||||
port \
|
||||
- timezone \
|
||||
backend \
|
||||
- backend/utils/mb/conversion_procs \
|
||||
- backend/snowball \
|
||||
include \
|
||||
interfaces \
|
||||
- backend/replication/libpqwalreceiver \
|
||||
bin \
|
||||
- pl \
|
||||
- makefiles \
|
||||
- test/regress
|
||||
+ makefiles
|
||||
|
||||
# There are too many interdependencies between the subdirectories, so
|
||||
# don't attempt parallel make here.
|
||||
@ -0,0 +1,143 @@
|
||||
diff -Naur a/contrib/Makefile b/contrib/Makefile
|
||||
--- a/contrib/Makefile 2012-05-10 18:35:09.000000000 -0400
|
||||
+++ b/contrib/Makefile 2012-05-20 09:33:47.892622992 -0400
|
||||
@@ -5,58 +5,10 @@
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
SUBDIRS = \
|
||||
- adminpack \
|
||||
- auth_delay \
|
||||
- auto_explain \
|
||||
- btree_gin \
|
||||
- btree_gist \
|
||||
- chkpass \
|
||||
- citext \
|
||||
- cube \
|
||||
- dblink \
|
||||
- dict_int \
|
||||
- dict_xsyn \
|
||||
- dummy_seclabel \
|
||||
- earthdistance \
|
||||
- file_fdw \
|
||||
- fuzzystrmatch \
|
||||
- hstore \
|
||||
- intagg \
|
||||
- intarray \
|
||||
- isn \
|
||||
- lo \
|
||||
- ltree \
|
||||
oid2name \
|
||||
- pageinspect \
|
||||
- passwordcheck \
|
||||
- pg_archivecleanup \
|
||||
- pg_buffercache \
|
||||
- pg_freespacemap \
|
||||
- pg_standby \
|
||||
- pg_stat_statements \
|
||||
- pg_test_fsync \
|
||||
- pg_test_timing \
|
||||
- pg_trgm \
|
||||
- pg_upgrade \
|
||||
- pg_upgrade_support \
|
||||
pgbench \
|
||||
- pgcrypto \
|
||||
- pgrowlocks \
|
||||
- pgstattuple \
|
||||
- seg \
|
||||
- spi \
|
||||
- tablefunc \
|
||||
- tcn \
|
||||
- test_parser \
|
||||
- tsearch2 \
|
||||
- unaccent \
|
||||
vacuumlo
|
||||
|
||||
-ifeq ($(with_openssl),yes)
|
||||
-SUBDIRS += sslinfo
|
||||
-else
|
||||
-ALWAYS_SUBDIRS += sslinfo
|
||||
-endif
|
||||
|
||||
ifeq ($(with_ossp_uuid),yes)
|
||||
SUBDIRS += uuid-ossp
|
||||
diff -Naur a/src/backend/Makefile b/src/backend/Makefile
|
||||
--- a/src/backend/Makefile 2012-05-10 18:35:09.000000000 -0400
|
||||
+++ b/src/backend/Makefile 2012-05-20 09:36:24.446654842 -0400
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
|
||||
+all: someheaders
|
||||
|
||||
ifneq ($(PORTNAME), cygwin)
|
||||
ifneq ($(PORTNAME), win32)
|
||||
@@ -114,7 +114,7 @@
|
||||
endif # aix
|
||||
|
||||
# Update the commonly used headers before building the subdirectories
|
||||
-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
|
||||
# run this unconditionally to avoid needing to know its dependencies here:
|
||||
submake-schemapg:
|
||||
@@ -207,23 +207,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-install: all installdirs install-bin
|
||||
-ifeq ($(PORTNAME), cygwin)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
-ifeq ($(PORTNAME), win32)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
- $(MAKE) -C catalog install-data
|
||||
- $(MAKE) -C tsearch install-data
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
|
||||
+install:
|
||||
|
||||
install-bin: postgres $(POSTGRES_IMP) installdirs
|
||||
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
|
||||
diff -Naur a/src/bin/Makefile b/src/bin/Makefile
|
||||
--- a/src/bin/Makefile 2012-05-10 18:35:09.000000000 -0400
|
||||
+++ b/src/bin/Makefile 2012-05-20 09:41:18.489958216 -0400
|
||||
@@ -13,8 +13,7 @@
|
||||
top_builddir = ../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
-SUBDIRS = initdb pg_ctl pg_dump \
|
||||
- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
|
||||
+SUBDIRS = pg_dump psql scripts pg_config
|
||||
|
||||
ifeq ($(PORTNAME), win32)
|
||||
SUBDIRS += pgevent
|
||||
diff -Naur a/src/Makefile b/src/Makefile
|
||||
--- a/src/Makefile 2012-05-10 18:35:09.000000000 -0400
|
||||
+++ b/src/Makefile 2012-05-20 09:40:13.532774840 -0400
|
||||
@@ -14,17 +14,11 @@
|
||||
|
||||
SUBDIRS = \
|
||||
port \
|
||||
- timezone \
|
||||
backend \
|
||||
- backend/utils/mb/conversion_procs \
|
||||
- backend/snowball \
|
||||
include \
|
||||
interfaces \
|
||||
- backend/replication/libpqwalreceiver \
|
||||
bin \
|
||||
- pl \
|
||||
- makefiles \
|
||||
- test/regress
|
||||
+ makefiles
|
||||
|
||||
# There are too many interdependencies between the subdirectories, so
|
||||
# don't attempt parallel make here.
|
||||
@ -0,0 +1,148 @@
|
||||
diff -Naur a/contrib/Makefile b/contrib/Makefile
|
||||
--- a/contrib/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/contrib/Makefile 2013-06-09 01:48:22.351874929 +0000
|
||||
@@ -5,61 +5,10 @@
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
SUBDIRS = \
|
||||
- adminpack \
|
||||
- auth_delay \
|
||||
- auto_explain \
|
||||
- btree_gin \
|
||||
- btree_gist \
|
||||
- chkpass \
|
||||
- citext \
|
||||
- cube \
|
||||
- dblink \
|
||||
- dict_int \
|
||||
- dict_xsyn \
|
||||
- dummy_seclabel \
|
||||
- earthdistance \
|
||||
- file_fdw \
|
||||
- fuzzystrmatch \
|
||||
- hstore \
|
||||
- intagg \
|
||||
- intarray \
|
||||
- isn \
|
||||
- lo \
|
||||
- ltree \
|
||||
oid2name \
|
||||
- pageinspect \
|
||||
- passwordcheck \
|
||||
- pg_archivecleanup \
|
||||
- pg_buffercache \
|
||||
- pg_freespacemap \
|
||||
- pg_standby \
|
||||
- pg_stat_statements \
|
||||
- pg_test_fsync \
|
||||
- pg_test_timing \
|
||||
- pg_trgm \
|
||||
- pg_upgrade \
|
||||
- pg_upgrade_support \
|
||||
pgbench \
|
||||
- pgcrypto \
|
||||
- pgrowlocks \
|
||||
- pgstattuple \
|
||||
- pg_xlogdump \
|
||||
- postgres_fdw \
|
||||
- seg \
|
||||
- spi \
|
||||
- tablefunc \
|
||||
- tcn \
|
||||
- test_parser \
|
||||
- tsearch2 \
|
||||
- unaccent \
|
||||
- vacuumlo \
|
||||
- worker_spi
|
||||
+ vacuumlo
|
||||
|
||||
-ifeq ($(with_openssl),yes)
|
||||
-SUBDIRS += sslinfo
|
||||
-else
|
||||
-ALWAYS_SUBDIRS += sslinfo
|
||||
-endif
|
||||
|
||||
ifeq ($(with_ossp_uuid),yes)
|
||||
SUBDIRS += uuid-ossp
|
||||
diff -Naur a/src/backend/Makefile b/src/backend/Makefile
|
||||
--- a/src/backend/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/src/backend/Makefile 2013-06-09 01:50:19.655864258 +0000
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
|
||||
+all: someheaders
|
||||
|
||||
ifneq ($(PORTNAME), cygwin)
|
||||
ifneq ($(PORTNAME), win32)
|
||||
@@ -116,7 +116,7 @@
|
||||
endif # aix
|
||||
|
||||
# Update the commonly used headers before building the subdirectories
|
||||
-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
|
||||
# run this unconditionally to avoid needing to know its dependencies here:
|
||||
submake-schemapg:
|
||||
@@ -209,23 +209,8 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-install: all installdirs install-bin
|
||||
-ifeq ($(PORTNAME), cygwin)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
-ifeq ($(PORTNAME), win32)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
- $(MAKE) -C catalog install-data
|
||||
- $(MAKE) -C tsearch install-data
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
|
||||
+install:
|
||||
+
|
||||
|
||||
install-bin: postgres $(POSTGRES_IMP) installdirs
|
||||
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
|
||||
diff -Naur a/src/bin/Makefile b/src/bin/Makefile
|
||||
--- a/src/bin/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/src/bin/Makefile 2013-06-09 01:51:56.143824442 +0000
|
||||
@@ -13,8 +13,7 @@
|
||||
top_builddir = ../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
-SUBDIRS = initdb pg_ctl pg_dump \
|
||||
- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
|
||||
+SUBDIRS = pg_dump psql scripts pg_config
|
||||
|
||||
ifeq ($(PORTNAME), win32)
|
||||
SUBDIRS += pgevent
|
||||
diff -Naur a/src/Makefile b/src/Makefile
|
||||
--- a/src/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/src/Makefile 2013-06-09 01:54:30.479704228 +0000
|
||||
@@ -15,17 +15,11 @@
|
||||
SUBDIRS = \
|
||||
common \
|
||||
port \
|
||||
- timezone \
|
||||
backend \
|
||||
- backend/utils/mb/conversion_procs \
|
||||
- backend/snowball \
|
||||
include \
|
||||
interfaces \
|
||||
- backend/replication/libpqwalreceiver \
|
||||
bin \
|
||||
- pl \
|
||||
- makefiles \
|
||||
- test/regress
|
||||
+ makefiles
|
||||
|
||||
# There are too many interdependencies between the subdirectories, so
|
||||
# don't attempt parallel make here.
|
||||
@ -0,0 +1,151 @@
|
||||
diff -Naur a/contrib/Makefile b/contrib/Makefile
|
||||
--- a/contrib/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/contrib/Makefile 2013-06-09 01:48:22.351874929 +0000
|
||||
@@ -5,64 +5,10 @@
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
SUBDIRS = \
|
||||
- adminpack \
|
||||
- auth_delay \
|
||||
- auto_explain \
|
||||
- btree_gin \
|
||||
- btree_gist \
|
||||
- chkpass \
|
||||
- citext \
|
||||
- cube \
|
||||
- dblink \
|
||||
- dict_int \
|
||||
- dict_xsyn \
|
||||
- dummy_seclabel \
|
||||
- earthdistance \
|
||||
- file_fdw \
|
||||
- fuzzystrmatch \
|
||||
- hstore \
|
||||
- intagg \
|
||||
- intarray \
|
||||
- isn \
|
||||
- lo \
|
||||
- ltree \
|
||||
oid2name \
|
||||
- pageinspect \
|
||||
- passwordcheck \
|
||||
- pg_archivecleanup \
|
||||
- pg_buffercache \
|
||||
- pg_freespacemap \
|
||||
- pg_prewarm \
|
||||
- pg_standby \
|
||||
- pg_stat_statements \
|
||||
- pg_test_fsync \
|
||||
- pg_test_timing \
|
||||
- pg_trgm \
|
||||
- pg_upgrade \
|
||||
- pg_upgrade_support \
|
||||
pgbench \
|
||||
- pgcrypto \
|
||||
- pgrowlocks \
|
||||
- pgstattuple \
|
||||
- pg_xlogdump \
|
||||
- postgres_fdw \
|
||||
- seg \
|
||||
- spi \
|
||||
- tablefunc \
|
||||
- tcn \
|
||||
- test_decoding \
|
||||
- test_parser \
|
||||
- test_shm_mq \
|
||||
- tsearch2 \
|
||||
- unaccent \
|
||||
- vacuumlo \
|
||||
- worker_spi
|
||||
+ vacuumlo
|
||||
|
||||
-ifeq ($(with_openssl),yes)
|
||||
-SUBDIRS += sslinfo
|
||||
-else
|
||||
-ALWAYS_SUBDIRS += sslinfo
|
||||
-endif
|
||||
|
||||
ifeq ($(with_ossp_uuid),yes)
|
||||
SUBDIRS += uuid-ossp
|
||||
diff -Naur a/src/backend/Makefile b/src/backend/Makefile
|
||||
--- a/src/backend/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/src/backend/Makefile 2013-06-09 01:50:19.655864258 +0000
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
|
||||
+all: someheaders
|
||||
|
||||
ifneq ($(PORTNAME), cygwin)
|
||||
ifneq ($(PORTNAME), win32)
|
||||
@@ -116,7 +116,7 @@
|
||||
endif # aix
|
||||
|
||||
# Update the commonly used headers before building the subdirectories
|
||||
-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
|
||||
# run this unconditionally to avoid needing to know its dependencies here:
|
||||
submake-schemapg:
|
||||
@@ -209,23 +209,8 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-install: all installdirs install-bin
|
||||
-ifeq ($(PORTNAME), cygwin)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
-ifeq ($(PORTNAME), win32)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
- $(MAKE) -C catalog install-data
|
||||
- $(MAKE) -C tsearch install-data
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
|
||||
+install:
|
||||
+
|
||||
|
||||
install-bin: postgres $(POSTGRES_IMP) installdirs
|
||||
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
|
||||
diff -Naur a/src/bin/Makefile b/src/bin/Makefile
|
||||
--- a/src/bin/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/src/bin/Makefile 2013-06-09 01:51:56.143824442 +0000
|
||||
@@ -13,8 +13,7 @@
|
||||
top_builddir = ../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
-SUBDIRS = initdb pg_ctl pg_dump \
|
||||
- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
|
||||
+SUBDIRS = pg_dump psql scripts pg_config
|
||||
|
||||
ifeq ($(PORTNAME), win32)
|
||||
SUBDIRS += pgevent
|
||||
diff -Naur a/src/Makefile b/src/Makefile
|
||||
--- a/src/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/src/Makefile 2013-06-09 01:54:30.479704228 +0000
|
||||
@@ -15,17 +15,11 @@
|
||||
SUBDIRS = \
|
||||
common \
|
||||
port \
|
||||
- timezone \
|
||||
backend \
|
||||
- backend/utils/mb/conversion_procs \
|
||||
- backend/snowball \
|
||||
include \
|
||||
interfaces \
|
||||
- backend/replication/libpqwalreceiver \
|
||||
bin \
|
||||
- pl \
|
||||
- makefiles \
|
||||
- test/regress
|
||||
+ makefiles
|
||||
|
||||
# There are too many interdependencies between the subdirectories, so
|
||||
# don't attempt parallel make here.
|
||||
@ -0,0 +1,152 @@
|
||||
diff --git a/contrib/Makefile b/contrib/Makefile
|
||||
index b37d0dd..b56fbf6 100644
|
||||
--- a/contrib/Makefile
|
||||
+++ b/contrib/Makefile
|
||||
@@ -5,64 +5,9 @@ top_builddir = ..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
SUBDIRS = \
|
||||
- adminpack \
|
||||
- auth_delay \
|
||||
- auto_explain \
|
||||
- btree_gin \
|
||||
- btree_gist \
|
||||
- chkpass \
|
||||
- citext \
|
||||
- cube \
|
||||
- dblink \
|
||||
- dict_int \
|
||||
- dict_xsyn \
|
||||
- dummy_seclabel \
|
||||
- earthdistance \
|
||||
- file_fdw \
|
||||
- fuzzystrmatch \
|
||||
- hstore \
|
||||
- intagg \
|
||||
- intarray \
|
||||
- isn \
|
||||
- lo \
|
||||
- ltree \
|
||||
oid2name \
|
||||
- pageinspect \
|
||||
- passwordcheck \
|
||||
- pg_archivecleanup \
|
||||
- pg_buffercache \
|
||||
- pg_freespacemap \
|
||||
- pg_prewarm \
|
||||
- pg_standby \
|
||||
- pg_stat_statements \
|
||||
- pg_test_fsync \
|
||||
- pg_test_timing \
|
||||
- pg_trgm \
|
||||
- pg_upgrade \
|
||||
- pg_upgrade_support \
|
||||
pgbench \
|
||||
- pgcrypto \
|
||||
- pgrowlocks \
|
||||
- pgstattuple \
|
||||
- pg_xlogdump \
|
||||
- postgres_fdw \
|
||||
- seg \
|
||||
- spi \
|
||||
- tablefunc \
|
||||
- tcn \
|
||||
- test_decoding \
|
||||
- test_parser \
|
||||
- test_shm_mq \
|
||||
- tsearch2 \
|
||||
- unaccent \
|
||||
- vacuumlo \
|
||||
- worker_spi
|
||||
-
|
||||
-ifeq ($(with_openssl),yes)
|
||||
-SUBDIRS += sslinfo
|
||||
-else
|
||||
-ALWAYS_SUBDIRS += sslinfo
|
||||
-endif
|
||||
+ vacuumlo
|
||||
|
||||
ifneq ($(with_uuid),no)
|
||||
SUBDIRS += uuid-ossp
|
||||
diff -Naur a/src/backend/Makefile b/src/backend/Makefile
|
||||
--- a/src/backend/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/src/backend/Makefile 2013-06-09 01:50:19.655864258 +0000
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
|
||||
+all: someheaders
|
||||
|
||||
ifneq ($(PORTNAME), cygwin)
|
||||
ifneq ($(PORTNAME), win32)
|
||||
@@ -116,7 +116,7 @@
|
||||
endif # aix
|
||||
|
||||
# Update the commonly used headers before building the subdirectories
|
||||
-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
|
||||
# run this unconditionally to avoid needing to know its dependencies here:
|
||||
submake-schemapg:
|
||||
@@ -209,23 +209,8 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-install: all installdirs install-bin
|
||||
-ifeq ($(PORTNAME), cygwin)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
-ifeq ($(PORTNAME), win32)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
- $(MAKE) -C catalog install-data
|
||||
- $(MAKE) -C tsearch install-data
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
|
||||
+install:
|
||||
+
|
||||
|
||||
install-bin: postgres $(POSTGRES_IMP) installdirs
|
||||
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
|
||||
diff -Naur a/src/bin/Makefile b/src/bin/Makefile
|
||||
--- a/src/bin/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/src/bin/Makefile 2013-06-09 01:51:56.143824442 +0000
|
||||
@@ -13,8 +13,7 @@
|
||||
top_builddir = ../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
-SUBDIRS = initdb pg_ctl pg_dump \
|
||||
- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
|
||||
+SUBDIRS = pg_dump psql scripts pg_config
|
||||
|
||||
ifeq ($(PORTNAME), win32)
|
||||
SUBDIRS += pgevent
|
||||
diff -Naur a/src/Makefile b/src/Makefile
|
||||
--- a/src/Makefile 2013-05-06 20:57:06.000000000 +0000
|
||||
+++ b/src/Makefile 2013-06-09 01:54:30.479704228 +0000
|
||||
@@ -15,17 +15,11 @@
|
||||
SUBDIRS = \
|
||||
common \
|
||||
port \
|
||||
- timezone \
|
||||
backend \
|
||||
- backend/utils/mb/conversion_procs \
|
||||
- backend/snowball \
|
||||
include \
|
||||
interfaces \
|
||||
- backend/replication/libpqwalreceiver \
|
||||
bin \
|
||||
- pl \
|
||||
- makefiles \
|
||||
- test/regress
|
||||
+ makefiles
|
||||
|
||||
# There are too many interdependencies between the subdirectories, so
|
||||
# don't attempt parallel make here.
|
||||
@ -1,405 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4_beta2.ebuild,v 1.1 2014/10/11 19:35:08 titanofold Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
|
||||
WANT_AUTOMAKE="none"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib pam prefix python-single-r1 systemd user versionator
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~sparc-fbsd ~x86-fbsd ~x86-solaris"
|
||||
|
||||
MY_PV=${PV/_/}
|
||||
SLOT="$(get_version_component_range 1-2)"
|
||||
S="${WORKDIR}/postgresql-${MY_PV}"
|
||||
SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
|
||||
|
||||
# Add patch and initscript source.
|
||||
SRC_URI+=" http://dev.gentoo.org/~patrick/postgresql-patches-${SLOT}-r1.tbz2
|
||||
http://dev.gentoo.org/~floppym/dist/postgresql-initscript-2.7.tbz2"
|
||||
|
||||
LICENSE="POSTGRESQL GPL-2"
|
||||
DESCRIPTION="PostgreSQL RDBMS"
|
||||
HOMEPAGE="http://www.postgresql.org/"
|
||||
|
||||
LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW"
|
||||
IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python +readline selinux server ssl tcl threads uuid xml zlib"
|
||||
|
||||
for lingua in ${LINGUAS}; do
|
||||
IUSE+=" linguas_${lingua}"
|
||||
done
|
||||
|
||||
wanted_languages() {
|
||||
local enable_langs
|
||||
|
||||
for lingua in ${LINGUAS} ; do
|
||||
use linguas_${lingua} && enable_langs+="${lingua} "
|
||||
done
|
||||
|
||||
echo -n ${enable_langs}
|
||||
}
|
||||
|
||||
RDEPEND="
|
||||
>=app-admin/eselect-postgresql-1.2.0
|
||||
sys-apps/less
|
||||
virtual/libintl
|
||||
kerberos? ( virtual/krb5 )
|
||||
ldap? ( net-nds/openldap )
|
||||
pam? ( virtual/pam )
|
||||
perl? ( >=dev-lang/perl-5.8 )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
readline? ( sys-libs/readline )
|
||||
selinux? ( sec-policy/selinux-postgresql )
|
||||
ssl? ( >=dev-libs/openssl-0.9.6-r1 )
|
||||
tcl? ( >=dev-lang/tcl-8 )
|
||||
uuid? ( dev-libs/ossp-uuid )
|
||||
xml? ( dev-libs/libxml2 dev-libs/libxslt )
|
||||
zlib? ( sys-libs/zlib )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
!!dev-db/postgresql-docs:${SLOT}
|
||||
!!dev-db/postgresql-base:${SLOT}
|
||||
!!dev-db/postgresql-server:${SLOT}
|
||||
!!<sys-apps/sandbox-2.0
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
nls? ( sys-devel/gettext )
|
||||
xml? ( virtual/pkgconfig )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup postgres 70
|
||||
enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
|
||||
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Eliminate autotools version check
|
||||
sed '/m4_PACKAGE_VERSION/,+3d' -i configure.in || die
|
||||
|
||||
# Work around PPC{,64} compilation bug where bool is already defined
|
||||
sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
|
||||
|
||||
# Set proper run directory
|
||||
sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
|
||||
-i src/include/pg_config_manual.h || die
|
||||
|
||||
sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
|
||||
-i "${WORKDIR}"/postgresql{.{init,confd,service},-check-db-dir} || \
|
||||
die "SLOT/LIBDIR sed failed"
|
||||
|
||||
use server || epatch "${WORKDIR}/base.patch"
|
||||
|
||||
if use pam ; then
|
||||
sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
|
||||
-i src/backend/libpq/auth.c || \
|
||||
die 'PGSQL_PAM_SERVICE rename failed.'
|
||||
fi
|
||||
|
||||
eautoconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
case ${CHOST} in
|
||||
*-darwin*|*-solaris*)
|
||||
use nls && append-libs intl
|
||||
;;
|
||||
esac
|
||||
|
||||
export LDFLAGS_SL="${LDFLAGS}"
|
||||
export LDFLAGS_EX="${LDFLAGS}"
|
||||
|
||||
local PO="${EPREFIX%/}"
|
||||
|
||||
econf \
|
||||
--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
|
||||
--datadir="${PO}/usr/share/postgresql-${SLOT}" \
|
||||
--docdir="${PO}/usr/share/doc/postgresql-${SLOT}" \
|
||||
--includedir="${PO}/usr/include/postgresql-${SLOT}" \
|
||||
--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
|
||||
--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
|
||||
--with-system-tzdata="${PO}/usr/share/zoneinfo" \
|
||||
$(use_enable !pg_legacytimestamp integer-datetimes) \
|
||||
$(use_enable threads thread-safety) \
|
||||
$(use_with kerberos gssapi) \
|
||||
$(use_with ldap) \
|
||||
$(use_with pam) \
|
||||
$(use_with perl) \
|
||||
$(use_with python) \
|
||||
$(use_with readline) \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_with tcl) \
|
||||
$(use_with uuid ossp-uuid) \
|
||||
$(use_with xml libxml) \
|
||||
$(use_with xml libxslt) \
|
||||
$(use_with zlib) \
|
||||
"$(use_enable nls nls "$(wanted_languages)")"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
emake -C contrib
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
emake DESTDIR="${D}" install -C contrib
|
||||
|
||||
dodoc README HISTORY doc/{TODO,bug.template}
|
||||
|
||||
# man pages are already built, but if we have the target make them,
|
||||
# they'll be generated from source before being installed so we
|
||||
# manually install man pages.
|
||||
# We use ${SLOT} instead of doman for postgresql.eselect
|
||||
insinto /usr/share/postgresql-${SLOT}/man/
|
||||
doins -r doc/src/sgml/man{1,3,7}
|
||||
if ! use server; then
|
||||
# Remove man pages for non-existent binaries
|
||||
for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
|
||||
rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
|
||||
done
|
||||
fi
|
||||
docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
|
||||
|
||||
insinto /etc/postgresql-${SLOT}
|
||||
newins src/bin/psql/psqlrc.sample psqlrc
|
||||
|
||||
dodir /etc/eselect/postgresql/slots/${SLOT}
|
||||
echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
|
||||
"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
|
||||
|
||||
if use doc ; then
|
||||
docinto html
|
||||
dodoc doc/src/sgml/html/*
|
||||
|
||||
docinto sgml
|
||||
dodoc doc/src/sgml/*.{sgml,dsl}
|
||||
fi
|
||||
|
||||
if use server; then
|
||||
newconfd "${WORKDIR}/postgresql.confd" postgresql-${SLOT}
|
||||
newinitd "${WORKDIR}/postgresql.init" postgresql-${SLOT}
|
||||
|
||||
systemd_newunit "${WORKDIR}"/postgresql.service postgresql-${SLOT}.service
|
||||
systemd_newtmpfilesd "${WORKDIR}"/postgresql.tmpfilesd postgresql-${SLOT}.conf
|
||||
newbin "${WORKDIR}"/postgresql-check-db-dir postgresql-${SLOT}-check-db-dir
|
||||
|
||||
use pam && pamd_mimic system-auth postgresql-${SLOT} auth account session
|
||||
|
||||
if use prefix ; then
|
||||
keepdir /run/postgresql
|
||||
fperms 0775 /run/postgresql
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
postgresql-config update
|
||||
|
||||
elog "If you need a global psqlrc-file, you can place it in:"
|
||||
elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
|
||||
|
||||
if use server ; then
|
||||
elog
|
||||
elog "Gentoo specific documentation:"
|
||||
elog "http://www.gentoo.org/doc/en/postgres-howto.xml"
|
||||
elog
|
||||
elog "Official documentation:"
|
||||
elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
|
||||
elog
|
||||
elog "The default location of the Unix-domain socket is:"
|
||||
elog " ${EROOT%/}/run/postgresql/"
|
||||
elog
|
||||
elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
|
||||
elog "so that it contains your preferred locale in:"
|
||||
elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
|
||||
elog
|
||||
elog "Then, execute the following command to setup the initial database"
|
||||
elog "environment:"
|
||||
elog " emerge --config =${CATEGORY}/${PF}"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
if [[ $(use server) && -z ${REPLACED_BY_VERSION} ]] ; then
|
||||
ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
|
||||
ewarn "\thttp://www.gentoo.org/doc/en/postgres-howto.xml#doc_chap5"
|
||||
|
||||
ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
|
||||
sleep 10
|
||||
eend 0
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
postgresql-config update
|
||||
}
|
||||
|
||||
pkg_config() {
|
||||
use server || die "USE flag 'server' not enabled. Nothing to configure."
|
||||
|
||||
[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
|
||||
[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
|
||||
[[ -z "${DATA_DIR}" ]] && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
|
||||
|
||||
# environment.bz2 may not contain the same locale as the current system
|
||||
# locale. Unset and source from the current system locale.
|
||||
if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
|
||||
unset LANG
|
||||
unset LC_CTYPE
|
||||
unset LC_NUMERIC
|
||||
unset LC_TIME
|
||||
unset LC_COLLATE
|
||||
unset LC_MONETARY
|
||||
unset LC_MESSAGES
|
||||
unset LC_ALL
|
||||
source "${EROOT%/}/etc/env.d/02locale"
|
||||
[ -n "${LANG}" ] && export LANG
|
||||
[ -n "${LC_CTYPE}" ] && export LC_CTYPE
|
||||
[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
|
||||
[ -n "${LC_TIME}" ] && export LC_TIME
|
||||
[ -n "${LC_COLLATE}" ] && export LC_COLLATE
|
||||
[ -n "${LC_MONETARY}" ] && export LC_MONETARY
|
||||
[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
|
||||
[ -n "${LC_ALL}" ] && export LC_ALL
|
||||
fi
|
||||
|
||||
einfo "You can modify the paths and options passed to initdb by editing:"
|
||||
einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
|
||||
einfo
|
||||
einfo "Information on options that can be passed to initdb are found at:"
|
||||
einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
|
||||
einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
|
||||
einfo
|
||||
einfo "PG_INITDB_OPTS is currently set to:"
|
||||
if [[ -z "${PG_INITDB_OPTS}" ]] ; then
|
||||
einfo " (none)"
|
||||
else
|
||||
einfo " ${PG_INITDB_OPTS}"
|
||||
fi
|
||||
einfo
|
||||
einfo "Configuration files will be installed to:"
|
||||
einfo " ${PGDATA}"
|
||||
einfo
|
||||
einfo "The database cluster will be created in:"
|
||||
einfo " ${DATA_DIR}"
|
||||
einfo
|
||||
while [ "$correct" != "true" ] ; do
|
||||
einfo "Are you ready to continue? (y/n)"
|
||||
read answer
|
||||
if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
|
||||
correct="true"
|
||||
elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
|
||||
die "Aborting initialization."
|
||||
else
|
||||
echo "Answer not recognized"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
|
||||
eerror "The given directory, '${DATA_DIR}', is not empty."
|
||||
eerror "Modify DATA_DIR to point to an empty directory."
|
||||
die "${DATA_DIR} is not empty."
|
||||
fi
|
||||
|
||||
[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
|
||||
einfo "Checking system parameters..."
|
||||
|
||||
if ! use kernel_linux ; then
|
||||
einfo "Skipped."
|
||||
einfo " Tests not supported on this OS (yet)"
|
||||
else
|
||||
if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
|
||||
einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..."
|
||||
|
||||
local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
|
||||
local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
|
||||
local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
|
||||
local SHMMAX=$(sysctl -n kernel.shmmax)
|
||||
|
||||
local SEMMSL_MIN=17
|
||||
local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
|
||||
local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
|
||||
local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
|
||||
|
||||
for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
|
||||
if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
|
||||
eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
|
||||
eerror "You have now several options:"
|
||||
eerror " - Change the mentioned system parameter"
|
||||
eerror " - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a"
|
||||
eerror " value lower than ${PG_MAX_CONNECTIONS}"
|
||||
eerror " - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely"
|
||||
eerror "More information can be found here:"
|
||||
eerror " http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
|
||||
die "System test failed."
|
||||
fi
|
||||
done
|
||||
einfo "Passed."
|
||||
else
|
||||
ewarn "SKIP_SYSTEM_TESTS set, so skipping."
|
||||
fi
|
||||
fi
|
||||
|
||||
einfo "Creating the data directory ..."
|
||||
if [[ ${EUID} == 0 ]] ; then
|
||||
mkdir -p "${DATA_DIR}"
|
||||
chown -Rf postgres:postgres "${DATA_DIR}"
|
||||
chmod 0700 "${DATA_DIR}"
|
||||
fi
|
||||
|
||||
einfo "Initializing the database ..."
|
||||
|
||||
if [[ ${EUID} == 0 ]] ; then
|
||||
su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
|
||||
else
|
||||
"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
|
||||
fi
|
||||
|
||||
mv "${DATA_DIR%/}"/*.conf "${PGDATA}"
|
||||
|
||||
einfo "The autovacuum function, which was in contrib, has been moved to the main"
|
||||
einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
|
||||
einfo "by default. You can disable it in the cluster's:"
|
||||
einfo " ${PGDATA%/}/postgresql.conf"
|
||||
einfo
|
||||
einfo "The PostgreSQL server, by default, will log events to:"
|
||||
einfo " ${DATA_DIR%/}/postmaster.log"
|
||||
einfo
|
||||
if use prefix ; then
|
||||
einfo "The location of the configuration files have moved to:"
|
||||
einfo " ${PGDATA}"
|
||||
einfo "To start the server:"
|
||||
einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
|
||||
einfo "To stop:"
|
||||
einfo " pg_ctl stop -D ${DATA_DIR}"
|
||||
einfo
|
||||
einfo "Or move the configuration files back:"
|
||||
einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
|
||||
else
|
||||
einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
|
||||
einfo "instead of 'pg_ctl'."
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
|
||||
|
||||
if [[ $(use server) -eq 0 && ${UID} -ne 0 ]] ; then
|
||||
emake check
|
||||
|
||||
einfo "If you think other tests besides the regression tests are necessary, please"
|
||||
einfo "submit a bug including a patch for this ebuild to enable them."
|
||||
else
|
||||
use server || \
|
||||
ewarn 'Tests cannot be run without the "server" use flag enabled.'
|
||||
[[ ${UID} -eq 0 ]] || \
|
||||
ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
|
||||
|
||||
ewarn 'Skipping.'
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,349 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild,v 1.1 2014/11/01 17:59:37 caster Exp $
|
||||
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
|
||||
|
||||
# *********************************************************
|
||||
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
|
||||
# *********************************************************
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
|
||||
|
||||
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
|
||||
ICEDTEA_BRANCH=$(get_version_component_range 1-3)
|
||||
OPENJDK_BUILD="33"
|
||||
OPENJDK_DATE="14_oct_2014"
|
||||
OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
|
||||
# Download cacao and jamvm regardless for use with EXTRA_ECONF
|
||||
CACAO_TARBALL="68fe50ac34ec.tar.gz"
|
||||
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
|
||||
|
||||
CACAO_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-cacao-${CACAO_TARBALL}"
|
||||
JAMVM_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-${JAMVM_TARBALL}"
|
||||
|
||||
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
|
||||
HOMEPAGE="http://icedtea.classpath.org"
|
||||
SRC_PKG="${ICEDTEA_PKG}.tar.xz"
|
||||
SRC_URI="
|
||||
http://icedtea.classpath.org/download/source/${SRC_PKG}
|
||||
https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
|
||||
http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
|
||||
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
|
||||
|
||||
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
|
||||
SLOT="6"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap kerberos +nsplugin
|
||||
+nss pax_kernel pulseaudio selinux +source systemtap test +webstart"
|
||||
|
||||
# Ideally the following were optional at build time.
|
||||
ALSA_COMMON_DEP="
|
||||
>=media-libs/alsa-lib-1.0"
|
||||
CUPS_COMMON_DEP="
|
||||
>=net-print/cups-1.2.12"
|
||||
X_COMMON_DEP="
|
||||
dev-libs/glib
|
||||
>=media-libs/freetype-2.3.5:2=
|
||||
>=x11-libs/gtk+-2.8:2=
|
||||
>=x11-libs/libX11-1.1.3
|
||||
>=x11-libs/libXext-1.1.1
|
||||
>=x11-libs/libXi-1.1.3
|
||||
>=x11-libs/libXrender-0.9.4
|
||||
>=x11-libs/libXtst-1.0.3
|
||||
x11-libs/libXt"
|
||||
X_DEPEND="
|
||||
>=x11-libs/libXau-1.0.3
|
||||
>=x11-libs/libXdmcp-1.0.2
|
||||
>=x11-libs/libXinerama-1.0.2
|
||||
x11-proto/inputproto
|
||||
>=x11-proto/xextproto-7.1.1
|
||||
x11-proto/xineramaproto
|
||||
x11-proto/xproto"
|
||||
|
||||
COMMON_DEP="
|
||||
>=media-libs/giflib-4.1.6:=
|
||||
>=media-libs/libpng-1.2:=
|
||||
>=sys-libs/zlib-1.2.3:=
|
||||
virtual/jpeg:0=
|
||||
>=media-libs/lcms-2.5
|
||||
javascript? ( dev-java/rhino:1.6 )
|
||||
kerberos? ( virtual/krb5 )
|
||||
nss? ( >=dev-libs/nss-3.12.5-r1 )
|
||||
pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= )
|
||||
selinux? ( sec-policy/selinux-java )
|
||||
systemtap? ( >=dev-util/systemtap-1 )
|
||||
!dev-java/icedtea-web:6"
|
||||
|
||||
# media-fonts/lklug needs ppc ppc64 keywords
|
||||
RDEPEND="${COMMON_DEP}
|
||||
!dev-java/icedtea6
|
||||
X? (
|
||||
${X_COMMON_DEP}
|
||||
media-fonts/dejavu
|
||||
cjk? (
|
||||
media-fonts/arphicfonts
|
||||
media-fonts/baekmuk-fonts
|
||||
!ppc? ( !ppc64? ( media-fonts/lklug ) )
|
||||
media-fonts/lohit-fonts
|
||||
media-fonts/sazanami
|
||||
)
|
||||
)
|
||||
alsa? ( ${ALSA_COMMON_DEP} )
|
||||
cups? ( ${CUPS_COMMON_DEP} )"
|
||||
|
||||
# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
|
||||
# ca-certificates, perl and openssl are used for the cacerts keystore generation
|
||||
# xext headers have two variants depending on version - bug #288855
|
||||
# !eclipse-ecj-3.7 - bug #392587
|
||||
# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
|
||||
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
|
||||
|| (
|
||||
>=dev-java/gcj-jdk-4.3
|
||||
dev-java/icedtea-bin:6
|
||||
dev-java/icedtea:6
|
||||
)
|
||||
app-arch/cpio
|
||||
app-arch/unzip
|
||||
app-arch/zip
|
||||
app-misc/ca-certificates
|
||||
>=dev-java/ant-core-1.8.2
|
||||
dev-lang/perl
|
||||
>=dev-libs/libxslt-1.1.26
|
||||
dev-libs/openssl
|
||||
virtual/pkgconfig
|
||||
sys-apps/lsb-release
|
||||
${X_DEPEND}
|
||||
pax_kernel? ( sys-apps/elfix )"
|
||||
|
||||
PDEPEND="webstart? (
|
||||
dev-java/icedtea-web:0
|
||||
)
|
||||
nsplugin? (
|
||||
dev-java/icedtea-web:0[nsplugin]
|
||||
)"
|
||||
|
||||
S="${WORKDIR}"/${ICEDTEA_PKG}
|
||||
|
||||
icedtea_check_requirements() {
|
||||
local CHECKREQS_DISK_BUILD
|
||||
|
||||
if use doc; then
|
||||
CHECKREQS_DISK_BUILD="8500M"
|
||||
else
|
||||
CHECKREQS_DISK_BUILD="8000M"
|
||||
fi
|
||||
|
||||
check-reqs_pkg_${EBUILD_PHASE}
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
icedtea_check_requirements
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
icedtea_check_requirements
|
||||
|
||||
JAVA_PKG_WANT_BUILD_VM="
|
||||
icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
|
||||
gcj-jdk"
|
||||
JAVA_PKG_WANT_SOURCE="1.5"
|
||||
JAVA_PKG_WANT_TARGET="1.5"
|
||||
|
||||
java-vm-2_pkg_setup
|
||||
java-pkg-2_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${SRC_PKG}
|
||||
}
|
||||
|
||||
java_prepare() {
|
||||
# For bootstrap builds as the sandbox control file might not yet exist.
|
||||
addpredict /proc/self/coredump_filter
|
||||
|
||||
# icedtea doesn't like some locales. #330433 #389717
|
||||
export LANG="C" LC_ALL="C"
|
||||
}
|
||||
|
||||
bootstrap_impossible() {
|
||||
# Fill this according to testing what works and what not
|
||||
has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local bootstrap config enable_cacao
|
||||
local vm=$(java-pkg_get-current-vm)
|
||||
|
||||
# IcedTea6 can't be built using IcedTea7; its class files are too new
|
||||
# Whether to bootstrap
|
||||
bootstrap="disable"
|
||||
if use jbootstrap; then
|
||||
if bootstrap_impossible "${vm}"; then
|
||||
einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
|
||||
else
|
||||
bootstrap="enable"
|
||||
fi
|
||||
fi
|
||||
|
||||
if has "${vm}" gcj-jdk; then
|
||||
# gcj-jdk ensures ecj is present.
|
||||
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
|
||||
bootstrap="enable"
|
||||
fi
|
||||
|
||||
config+=" --${bootstrap}-bootstrap"
|
||||
|
||||
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
|
||||
# Otherwise use CACAO
|
||||
if ! has "${ARCH}" amd64 arm sparc x86; then
|
||||
enable_cacao=yes
|
||||
elif use cacao; then
|
||||
ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
|
||||
ewarn 'If so, please rebuild with USE="-cacao"'
|
||||
enable_cacao=yes
|
||||
fi
|
||||
|
||||
if [[ ${enable_cacao} ]]; then
|
||||
config+=" --enable-cacao"
|
||||
fi
|
||||
|
||||
config+=" --with-parallel-jobs=$(makeopts_jobs)"
|
||||
|
||||
if use javascript ; then
|
||||
config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
|
||||
else
|
||||
config+=" --without-rhino"
|
||||
fi
|
||||
|
||||
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
|
||||
|
||||
econf ${config} \
|
||||
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
|
||||
--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
|
||||
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
|
||||
--with-jdk-home="$(java-config -O)" \
|
||||
--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
|
||||
--with-pkgversion="Gentoo package ${PF}" \
|
||||
--disable-downloading --disable-Werror \
|
||||
$(use_enable !debug optimizations) \
|
||||
$(use_enable doc docs) \
|
||||
$(use_enable kerberos system-kerberos) \
|
||||
$(use_enable nss) \
|
||||
$(use_enable pulseaudio pulse-java) \
|
||||
$(use_enable systemtap) \
|
||||
$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh")
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Would use GENTOO_VM otherwise.
|
||||
export ANT_RESPECT_JAVA_HOME=TRUE
|
||||
|
||||
# With ant >=1.8.2 all required tasks are part of ant-core
|
||||
export ANT_TASKS="none"
|
||||
|
||||
emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Use Xvfb for tests
|
||||
unset DISPLAY
|
||||
|
||||
Xemake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
|
||||
local ddest="${ED}/${dest}"
|
||||
dodir "${dest}"
|
||||
|
||||
dodoc README NEWS AUTHORS
|
||||
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
|
||||
|
||||
cd openjdk.build/j2sdk-image || die
|
||||
|
||||
# Ensures HeadlessGraphicsEnvironment is used.
|
||||
if ! use X; then
|
||||
rm -r jre/lib/$(get_system_arch)/xawt || die
|
||||
fi
|
||||
|
||||
# Don't hide classes
|
||||
rm lib/ct.sym || die
|
||||
|
||||
#402507
|
||||
mkdir jre/.systemPrefs || die
|
||||
touch jre/.systemPrefs/.system.lock || die
|
||||
touch jre/.systemPrefs/.systemRootModFile || die
|
||||
|
||||
# doins can't handle symlinks.
|
||||
cp -vRP bin include jre lib man "${ddest}" || die
|
||||
|
||||
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
|
||||
|
||||
if use doc; then
|
||||
# java-pkg_dohtml needed for package-list #302654
|
||||
java-pkg_dohtml -A dtd -r ../docs/* || die
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
dodir "${dest}/share"
|
||||
cp -vRP demo sample "${ddest}/share/" || die
|
||||
fi
|
||||
|
||||
if use source; then
|
||||
cp src.zip "${ddest}" || die
|
||||
fi
|
||||
|
||||
# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
|
||||
if use webstart || use nsplugin; then
|
||||
dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
|
||||
dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
|
||||
fi
|
||||
if use webstart; then
|
||||
dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
|
||||
dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
|
||||
fi
|
||||
|
||||
# Fix the permissions.
|
||||
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
|
||||
|
||||
# Needs to be done before generating cacerts
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
# We need to generate keystore - bug #273306
|
||||
einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
|
||||
mkdir "${T}/certgen" && cd "${T}/certgen" || die
|
||||
cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
|
||||
for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
|
||||
openssl x509 -text -in "${c}" >> all.crt || die
|
||||
done
|
||||
./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
|
||||
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
|
||||
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
|
||||
|
||||
# Bug 390663
|
||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
|
||||
eprefixify "${T}"/fontconfig.Gentoo.properties
|
||||
insinto "${dest}"/jre/lib
|
||||
doins "${T}"/fontconfig.Gentoo.properties
|
||||
|
||||
set_java_env "${FILESDIR}/icedtea.env"
|
||||
if ! use X || ! use alsa || ! use cups; then
|
||||
java-vm_revdep-mask "${dest}"
|
||||
fi
|
||||
java-vm_sandbox-predict /proc/self/coredump_filter
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
|
||||
# portage would preserve the symlink otherwise, related to bug #384397
|
||||
rm -f "${EROOT}/usr/lib/jvm/icedtea6"
|
||||
elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
|
||||
elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
|
||||
elog "If you had icedtea6 as system VM, the change should be automatic, however"
|
||||
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
|
||||
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.71.ebuild,v 1.2 2014/11/01 17:00:46 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit versionator
|
||||
|
||||
DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html"
|
||||
ORIG_NAME="jdk-7u$(get_version_component_range 4)-docs-all.zip"
|
||||
|
||||
DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
|
||||
HOMEPAGE="http://download.oracle.com/javase/7/docs/"
|
||||
SRC_URI="${ORIG_NAME}"
|
||||
|
||||
LICENSE="oracle-java-documentation-7"
|
||||
SLOT="1.7"
|
||||
KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="app-arch/unzip"
|
||||
|
||||
RESTRICT="fetch"
|
||||
|
||||
S="${WORKDIR}/docs"
|
||||
|
||||
pkg_nofetch() {
|
||||
einfo "Please download ${ORIG_NAME} from "
|
||||
einfo "${DOWNLOAD_URL}"
|
||||
einfo "(agree to the license) and place it in ${DISTDIR}"
|
||||
|
||||
einfo "If you find the file on the download page replaced with a higher"
|
||||
einfo "version, please report to the bug 67266 (link below)."
|
||||
einfo "If emerge fails because of a checksum error it is possible that"
|
||||
einfo "the upstream release changed without renaming. Try downloading the file"
|
||||
einfo "again (or a newer revision if available). Otherwise report this to"
|
||||
einfo "http://bugs.gentoo.org/67266 and we will make a new revision."
|
||||
}
|
||||
|
||||
src_install(){
|
||||
insinto /usr/share/doc/${P}/html
|
||||
doins index.html
|
||||
|
||||
for i in *; do
|
||||
[[ -d $i ]] && doins -r $i
|
||||
done
|
||||
}
|
||||
@ -0,0 +1,307 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.71.ebuild,v 1.3 2014/11/01 17:00:38 ago Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils java-vm-2 prefix versionator
|
||||
|
||||
# This URIs need to be updated when bumping!
|
||||
JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html"
|
||||
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
|
||||
# This is a list of archs supported by this update.
|
||||
# Currently arm comes and goes.
|
||||
AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
|
||||
# Sometimes some or all of the demos are missing, this is to not have to rewrite half
|
||||
# the ebuild when it happens.
|
||||
DEMOS_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris x86-macos x64-macos )
|
||||
FX_VERSION="2_2_71"
|
||||
|
||||
MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
|
||||
S_PV="$(replace_version_separator 3 '_')"
|
||||
|
||||
AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
|
||||
AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
|
||||
AT_arm="jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
|
||||
AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
|
||||
AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
|
||||
AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
|
||||
AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
|
||||
AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg"
|
||||
AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
|
||||
|
||||
FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
|
||||
|
||||
DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz"
|
||||
DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
|
||||
DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
|
||||
DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
|
||||
DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz"
|
||||
DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
|
||||
DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
|
||||
DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
|
||||
DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
|
||||
|
||||
JCE_DIR="UnlimitedJCEPolicy"
|
||||
JCE_FILE="${JCE_DIR}JDK7.zip"
|
||||
|
||||
DESCRIPTION="Oracle's Java SE Development Kit"
|
||||
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
|
||||
for d in "${AT_AVAILABLE[@]}"; do
|
||||
SRC_URI+=" ${d}? ("
|
||||
SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")"
|
||||
if has ${d} "${DEMOS_AVAILABLE[@]}"; then
|
||||
SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
|
||||
fi
|
||||
SRC_URI+=" )"
|
||||
done
|
||||
unset d
|
||||
SRC_URI+=" jce? ( ${JCE_FILE} )"
|
||||
|
||||
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
|
||||
SLOT="1.7"
|
||||
KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source"
|
||||
|
||||
RESTRICT="fetch strip"
|
||||
QA_PREBUILT="*"
|
||||
|
||||
COMMON_DEP="
|
||||
selinux? ( sec-policy/selinux-java )"
|
||||
RDEPEND="${COMMON_DEP}
|
||||
X? ( !aqua? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXtst
|
||||
) )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
doc? ( dev-java/java-sdk-docs:1.7 )
|
||||
fontconfig? ( media-libs/fontconfig )
|
||||
!prefix? ( sys-libs/glibc )"
|
||||
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
|
||||
# marking. #427642
|
||||
DEPEND="${COMMON_DEP}
|
||||
jce? ( app-arch/unzip )
|
||||
examples? ( kernel_linux? ( app-arch/unzip ) )
|
||||
pax_kernel? ( sys-apps/paxctl )"
|
||||
|
||||
S="${WORKDIR}"/jdk${S_PV}
|
||||
|
||||
check_tarballs_available() {
|
||||
local uri=$1; shift
|
||||
local dl= unavailable=
|
||||
for dl in "${@}"; do
|
||||
[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
|
||||
done
|
||||
|
||||
if [[ -n "${unavailable}" ]]; then
|
||||
if [[ -z ${_check_tarballs_available_once} ]]; then
|
||||
einfo
|
||||
einfo "Oracle requires you to download the needed files manually after"
|
||||
einfo "accepting their license through a javascript capable web browser."
|
||||
einfo
|
||||
_check_tarballs_available_once=1
|
||||
fi
|
||||
einfo "Download the following files:"
|
||||
for dl in ${unavailable}; do
|
||||
einfo " ${dl}"
|
||||
done
|
||||
einfo "at '${uri}'"
|
||||
einfo "and move them to '${DISTDIR}'"
|
||||
einfo
|
||||
einfo "If the above mentioned urls do not point to the correct version anymore,"
|
||||
einfo "please download the files from Oracle's java download archive:"
|
||||
einfo
|
||||
einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jdk-${MY_PV}-oth-JPR"
|
||||
einfo
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_nofetch() {
|
||||
local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
|
||||
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
|
||||
distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
|
||||
fi
|
||||
check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
|
||||
|
||||
use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
# Special case for ARM soft VS hard float.
|
||||
if use arm ; then
|
||||
if [[ ${CHOST} == *-hardfloat-* ]] ; then
|
||||
unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
|
||||
use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
|
||||
else
|
||||
unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
|
||||
use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
|
||||
fi
|
||||
use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
|
||||
use jce && unpack ${JCE_FILE}
|
||||
elif use x86-macos || use x64-macos ; then
|
||||
pushd "${T}" > /dev/null
|
||||
mkdir dmgmount
|
||||
hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
|
||||
-mountpoint "${T}"/dmgmount
|
||||
xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg
|
||||
hdiutil detach "${T}"/dmgmount
|
||||
zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv
|
||||
mv Contents/Home "${S}"
|
||||
popd > /dev/null
|
||||
else
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use jce; then
|
||||
mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/opt/${P}"
|
||||
local ddest="${ED}${dest}"
|
||||
|
||||
# Create files used as storage for system preferences.
|
||||
mkdir jre/.systemPrefs || die
|
||||
touch jre/.systemPrefs/.system.lock || die
|
||||
touch jre/.systemPrefs/.systemRootModFile || die
|
||||
|
||||
# We should not need the ancient plugin for Firefox 2 anymore, plus it has
|
||||
# writable executable segments
|
||||
if use x86; then
|
||||
rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \
|
||||
{,jre/}lib/i386/libjavaplugin_nscp*.so
|
||||
rm -vrf jre/plugin/i386
|
||||
fi
|
||||
# Without nsplugin flag, also remove the new plugin
|
||||
local arch=${ARCH};
|
||||
use x86 && arch=i386;
|
||||
if ! use nsplugin; then
|
||||
rm -vf {,jre/}lib/${arch}/libnpjp2.so \
|
||||
{,jre/}lib/${arch}/libjavaplugin_jni.so
|
||||
fi
|
||||
|
||||
dodoc COPYRIGHT
|
||||
dohtml README.html
|
||||
|
||||
dodir "${dest}"
|
||||
cp -pPR bin include jre lib man "${ddest}" || die
|
||||
|
||||
if use derby; then
|
||||
cp -pPR db "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
|
||||
cp -pPR demo sample "${ddest}" || die
|
||||
if use kernel_linux; then
|
||||
cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \
|
||||
"${ddest}"/javafx-samples || die
|
||||
fi
|
||||
fi
|
||||
|
||||
if use jce; then
|
||||
dodir "${dest}"/jre/lib/security/strong-jce
|
||||
mv "${ddest}"/jre/lib/security/US_export_policy.jar \
|
||||
"${ddest}"/jre/lib/security/strong-jce || die
|
||||
mv "${ddest}"/jre/lib/security/local_policy.jar \
|
||||
"${ddest}"/jre/lib/security/strong-jce || die
|
||||
dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
|
||||
"${dest}"/jre/lib/security/US_export_policy.jar
|
||||
dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
|
||||
"${dest}"/jre/lib/security/local_policy.jar
|
||||
fi
|
||||
|
||||
if use nsplugin; then
|
||||
install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
|
||||
fi
|
||||
|
||||
if use source; then
|
||||
cp -p src.zip "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use !arm && use !x86-macos && use !x64-macos ; then
|
||||
# Install desktop file for the Java Control Panel.
|
||||
# Using ${PN}-${SLOT} to prevent file collision with jre and or
|
||||
# other slots. make_desktop_entry can't be used as ${P} would
|
||||
# end up in filename.
|
||||
newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
|
||||
sun-jcontrol-${PN}-${SLOT}.png || die
|
||||
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
|
||||
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
|
||||
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
|
||||
-e "s#Application;##" \
|
||||
-e "/Encoding/d" \
|
||||
jre/lib/desktop/applications/sun_java.desktop \
|
||||
> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
|
||||
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
|
||||
fi
|
||||
|
||||
# Prune all fontconfig files so libfontconfig will be used and only install
|
||||
# a Gentoo specific one if fontconfig is disabled.
|
||||
# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
|
||||
rm "${ddest}"/jre/lib/fontconfig.*
|
||||
if ! use fontconfig; then
|
||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
|
||||
eprefixify "${T}"/fontconfig.properties
|
||||
insinto "${dest}"/jre/lib/
|
||||
doins "${T}"/fontconfig.properties
|
||||
fi
|
||||
|
||||
# This needs to be done before CDS - #215225
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
# see bug #207282
|
||||
einfo "Creating the Class Data Sharing archives"
|
||||
case ${ARCH} in
|
||||
arm|ia64)
|
||||
${ddest}/bin/java -client -Xshare:dump || die
|
||||
;;
|
||||
x86)
|
||||
${ddest}/bin/java -client -Xshare:dump || die
|
||||
# limit heap size for large memory on x86 #467518
|
||||
# this is a workaround and shouldn't be needed.
|
||||
${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
|
||||
;;
|
||||
*)
|
||||
${ddest}/bin/java -server -Xshare:dump || die
|
||||
;;
|
||||
esac
|
||||
|
||||
# Remove empty dirs we might have copied
|
||||
find "${D}" -type d -empty -exec rmdir -v {} + || die
|
||||
|
||||
if use x86-macos || use x64-macos ; then
|
||||
# fix misc install_name issues
|
||||
pushd "${ddest}"/jre/lib > /dev/null || die
|
||||
local lib needed nlib npath
|
||||
for lib in \
|
||||
libJObjC libdecora-sse libglass libjavafx-{font,iio} \
|
||||
libjfxmedia libjfxwebkit libprism-es2 ;
|
||||
do
|
||||
lib=${lib}.dylib
|
||||
einfo "Fixing self-reference of ${lib}"
|
||||
install_name_tool \
|
||||
-id "${EPREFIX}${dest}/jre/lib/${lib}" \
|
||||
"${lib}"
|
||||
done
|
||||
popd > /dev/null
|
||||
for nlib in jdk1{5,6} ; do
|
||||
install_name_tool -change \
|
||||
/usr/lib/libgcc_s_ppc64.1.dylib \
|
||||
$($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.dylib) \
|
||||
"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
|
||||
install_name_tool -id \
|
||||
"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
|
||||
"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
|
||||
done
|
||||
fi
|
||||
|
||||
set_java_env
|
||||
java-vm_revdep-mask
|
||||
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
|
||||
}
|
||||
@ -0,0 +1,185 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.71.ebuild,v 1.2 2014/11/01 17:00:42 ago Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit java-vm-2 eutils prefix versionator
|
||||
|
||||
MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
|
||||
S_PV="$(replace_version_separator 3 '_')"
|
||||
|
||||
X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
|
||||
AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
|
||||
|
||||
# This URIs need updating when bumping!
|
||||
JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html"
|
||||
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
|
||||
|
||||
JCE_DIR="UnlimitedJCEPolicy"
|
||||
JCE_FILE="${JCE_DIR}JDK7.zip"
|
||||
|
||||
DESCRIPTION="Oracle's Java SE Runtime Environment"
|
||||
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
|
||||
SRC_URI="
|
||||
x86? ( ${X86_AT} )
|
||||
amd64? ( ${AMD64_AT} )
|
||||
jce? ( ${JCE_FILE} )"
|
||||
|
||||
LICENSE="Oracle-BCLA-JavaSE"
|
||||
SLOT="1.7"
|
||||
KEYWORDS="amd64 ~x86"
|
||||
IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
|
||||
|
||||
RESTRICT="fetch strip"
|
||||
QA_PREBUILT="*"
|
||||
|
||||
COMMON_DEP="
|
||||
selinux? ( sec-policy/selinux-java )"
|
||||
RDEPEND="${COMMON_DEP}
|
||||
X? (
|
||||
x11-libs/libXext
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXtst
|
||||
x11-libs/libX11
|
||||
)
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
fontconfig? ( media-libs/fontconfig )
|
||||
!prefix? ( sys-libs/glibc )"
|
||||
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
|
||||
# marking. #427642
|
||||
DEPEND="${COMMON_DEP}
|
||||
jce? ( app-arch/unzip )
|
||||
pax_kernel? ( sys-apps/paxctl )"
|
||||
|
||||
S="${WORKDIR}/jre${S_PV}"
|
||||
|
||||
pkg_nofetch() {
|
||||
if use x86; then
|
||||
AT=${X86_AT}
|
||||
elif use amd64; then
|
||||
AT=${AMD64_AT}
|
||||
fi
|
||||
|
||||
einfo "Please download '${AT}' from:"
|
||||
einfo "'${JRE_URI}'"
|
||||
einfo "and move it to '${DISTDIR}'"
|
||||
|
||||
if use jce; then
|
||||
einfo "Also download '${JCE_FILE}' from:"
|
||||
einfo "'${JCE_URI}'"
|
||||
einfo "and move it to '${DISTDIR}'"
|
||||
fi
|
||||
|
||||
einfo
|
||||
einfo "If the above mentioned urls do not point to the correct version anymore,"
|
||||
einfo "please download the files from Oracle's java download archive:"
|
||||
einfo
|
||||
einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jre-${MY_PV}-oth-JPR"
|
||||
einfo
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use jce; then
|
||||
mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/opt/${P}"
|
||||
local ddest="${ED}${dest}"
|
||||
|
||||
# Create files used as storage for system preferences.
|
||||
mkdir .systemPrefs || die
|
||||
touch .systemPrefs/.system.lock || die
|
||||
touch .systemPrefs/.systemRootModFile || die
|
||||
|
||||
# We should not need the ancient plugin for Firefox 2 anymore, plus it has
|
||||
# writable executable segments
|
||||
if use x86; then
|
||||
rm -vf lib/i386/libjavaplugin_oji.so \
|
||||
lib/i386/libjavaplugin_nscp*.so
|
||||
rm -vrf plugin/i386
|
||||
fi
|
||||
# Without nsplugin flag, also remove the new plugin
|
||||
local arch=${ARCH};
|
||||
use x86 && arch=i386;
|
||||
if ! use nsplugin; then
|
||||
rm -vf lib/${arch}/libnpjp2.so \
|
||||
lib/${arch}/libjavaplugin_jni.so
|
||||
fi
|
||||
|
||||
dodir "${dest}"
|
||||
cp -pPR bin lib man "${ddest}" || die
|
||||
|
||||
# This needs to be done before CDS - #215225
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
# see bug #207282
|
||||
einfo "Creating the Class Data Sharing archives"
|
||||
case ${ARCH} in
|
||||
arm|ia64)
|
||||
${ddest}/bin/java -client -Xshare:dump || die
|
||||
;;
|
||||
x86)
|
||||
${ddest}/bin/java -client -Xshare:dump || die
|
||||
# limit heap size for large memory on x86 #467518
|
||||
# this is a workaround and shouldn't be needed.
|
||||
${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
|
||||
;;
|
||||
*)
|
||||
${ddest}/bin/java -server -Xshare:dump || die
|
||||
;;
|
||||
esac
|
||||
|
||||
# Remove empty dirs we might have copied
|
||||
find "${D}" -type d -empty -exec rmdir -v {} + || die
|
||||
|
||||
dodoc COPYRIGHT README
|
||||
|
||||
if use jce; then
|
||||
dodir ${dest}/lib/security/strong-jce
|
||||
mv "${ddest}"/lib/security/US_export_policy.jar \
|
||||
"${ddest}"/lib/security/strong-jce || die
|
||||
mv "${ddest}"/lib/security/local_policy.jar \
|
||||
"${ddest}"/lib/security/strong-jce || die
|
||||
dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
|
||||
"${dest}"/lib/security/US_export_policy.jar
|
||||
dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
|
||||
"${dest}"/lib/security/local_policy.jar
|
||||
fi
|
||||
|
||||
if use nsplugin; then
|
||||
install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
|
||||
fi
|
||||
|
||||
# Install desktop file for the Java Control Panel.
|
||||
# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
|
||||
# make_desktop_entry can't be used as ${P} would end up in filename.
|
||||
newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
|
||||
sun-jcontrol-${PN}-${SLOT}.png || die
|
||||
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
|
||||
-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
|
||||
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
|
||||
-e "s#Application;##" \
|
||||
-e "/Encoding/d" \
|
||||
lib/desktop/applications/sun_java.desktop > \
|
||||
"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
|
||||
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
|
||||
|
||||
# Prune all fontconfig files so libfontconfig will be used and only install
|
||||
# a Gentoo specific one if fontconfig is disabled.
|
||||
# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
|
||||
rm "${ddest}"/lib/fontconfig.* || die
|
||||
if ! use fontconfig; then
|
||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
|
||||
eprefixify "${T}"/fontconfig.properties
|
||||
insinto "${dest}"/lib/
|
||||
doins "${T}"/fontconfig.properties
|
||||
fi
|
||||
|
||||
set_java_env
|
||||
java-vm_revdep-mask
|
||||
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
|
||||
}
|
||||
@ -0,0 +1,200 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.25.ebuild,v 1.2 2014/11/01 15:43:52 ercpe Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit java-vm-2 eutils prefix versionator
|
||||
|
||||
if [[ "$(get_version_component_range 4)" == 0 ]] ; then
|
||||
S_PV="$(get_version_component_range 1-3)"
|
||||
else
|
||||
MY_PV_EXT="u$(get_version_component_range 4)"
|
||||
S_PV="$(get_version_component_range 1-4)"
|
||||
fi
|
||||
|
||||
MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
|
||||
|
||||
X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
|
||||
AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
|
||||
|
||||
# This URIs need updating when bumping!
|
||||
JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
|
||||
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
|
||||
|
||||
JCE_DIR="UnlimitedJCEPolicyJDK8"
|
||||
JCE_FILE="jce_policy-8.zip"
|
||||
|
||||
DESCRIPTION="Oracle's Java SE Runtime Environment"
|
||||
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
|
||||
SRC_URI="
|
||||
x86? ( ${X86_AT} )
|
||||
amd64? ( ${AMD64_AT} )
|
||||
jce? ( ${JCE_FILE} )"
|
||||
|
||||
LICENSE="Oracle-BCLA-JavaSE"
|
||||
SLOT="1.8"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="X alsa fontconfig jce nsplugin pax_kernel selinux"
|
||||
|
||||
RESTRICT="fetch strip"
|
||||
QA_PREBUILT="*"
|
||||
|
||||
COMMON_DEP="
|
||||
selinux? ( sec-policy/selinux-java )"
|
||||
RDEPEND="${COMMON_DEP}
|
||||
X? (
|
||||
x11-libs/libXext
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXtst
|
||||
x11-libs/libX11
|
||||
)
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
fontconfig? ( media-libs/fontconfig )
|
||||
!prefix? ( sys-libs/glibc )"
|
||||
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback
|
||||
# marking. #427642
|
||||
DEPEND="${COMMON_DEP}
|
||||
jce? ( app-arch/unzip )
|
||||
pax_kernel? ( sys-apps/paxctl )"
|
||||
|
||||
S="${WORKDIR}/jre"
|
||||
|
||||
pkg_nofetch() {
|
||||
if use x86; then
|
||||
AT=${X86_AT}
|
||||
elif use amd64; then
|
||||
AT=${AMD64_AT}
|
||||
fi
|
||||
|
||||
einfo "Please download '${AT}' from:"
|
||||
einfo "'${JRE_URI}'"
|
||||
einfo "and move it to '${DISTDIR}'"
|
||||
|
||||
if use jce; then
|
||||
einfo "Also download '${JCE_FILE}' from:"
|
||||
einfo "'${JCE_URI}'"
|
||||
einfo "and move it to '${DISTDIR}'"
|
||||
fi
|
||||
|
||||
einfo
|
||||
einfo "If the above mentioned urls do not point to the correct version anymore,"
|
||||
einfo "please download the files from Oracle's java download archive:"
|
||||
einfo
|
||||
einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jre-${MY_PV}-oth-JPR"
|
||||
einfo
|
||||
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
|
||||
# Upstream is changing their versioning scheme every release around 1.8.0.*;
|
||||
# to stop having to change it over and over again, just wildcard match and
|
||||
# live a happy life instead of trying to get this new jre1.8.0_05 to work.
|
||||
mv "${WORKDIR}"/jre* "${S}" || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use jce; then
|
||||
mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/opt/${P}"
|
||||
local ddest="${ED}${dest}"
|
||||
|
||||
# Create files used as storage for system preferences.
|
||||
mkdir .systemPrefs || die
|
||||
touch .systemPrefs/.system.lock || die
|
||||
touch .systemPrefs/.systemRootModFile || die
|
||||
|
||||
# We should not need the ancient plugin for Firefox 2 anymore, plus it has
|
||||
# writable executable segments
|
||||
if use x86; then
|
||||
rm -vf lib/i386/libjavaplugin_oji.so \
|
||||
lib/i386/libjavaplugin_nscp*.so
|
||||
rm -vrf plugin/i386
|
||||
fi
|
||||
# Without nsplugin flag, also remove the new plugin
|
||||
local arch=${ARCH};
|
||||
use x86 && arch=i386;
|
||||
if ! use nsplugin; then
|
||||
rm -vf lib/${arch}/libnpjp2.so \
|
||||
lib/${arch}/libjavaplugin_jni.so
|
||||
fi
|
||||
|
||||
dodir "${dest}"
|
||||
cp -pPR bin lib man "${ddest}" || die
|
||||
|
||||
# This needs to be done before CDS - #215225
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
# see bug #207282
|
||||
einfo "Creating the Class Data Sharing archives"
|
||||
case ${ARCH} in
|
||||
arm|ia64)
|
||||
${ddest}/bin/java -client -Xshare:dump || die
|
||||
;;
|
||||
x86)
|
||||
${ddest}/bin/java -client -Xshare:dump || die
|
||||
# limit heap size for large memory on x86 #467518
|
||||
# this is a workaround and shouldn't be needed.
|
||||
${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
|
||||
;;
|
||||
*)
|
||||
${ddest}/bin/java -server -Xshare:dump || die
|
||||
;;
|
||||
esac
|
||||
# Remove empty dirs we might have copied
|
||||
find "${D}" -type d -empty -exec rmdir -v {} + || die
|
||||
|
||||
dodoc COPYRIGHT README
|
||||
|
||||
if use jce; then
|
||||
dodir ${dest}/lib/security/strong-jce
|
||||
mv "${ddest}"/lib/security/US_export_policy.jar \
|
||||
"${ddest}"/lib/security/strong-jce || die
|
||||
mv "${ddest}"/lib/security/local_policy.jar \
|
||||
"${ddest}"/lib/security/strong-jce || die
|
||||
dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
|
||||
"${dest}"/lib/security/US_export_policy.jar
|
||||
dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
|
||||
"${dest}"/lib/security/local_policy.jar
|
||||
fi
|
||||
|
||||
if use nsplugin; then
|
||||
install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so
|
||||
fi
|
||||
|
||||
# Install desktop file for the Java Control Panel.
|
||||
# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots.
|
||||
# make_desktop_entry can't be used as ${P} would end up in filename.
|
||||
newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
|
||||
sun-jcontrol-${PN}-${SLOT}.png || die
|
||||
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \
|
||||
-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
|
||||
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
|
||||
-e "s#Application;##" \
|
||||
-e "/Encoding/d" \
|
||||
lib/desktop/applications/sun_java.desktop > \
|
||||
"${T}"/jcontrol-${PN}-${SLOT}.desktop || die
|
||||
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
|
||||
|
||||
# Prune all fontconfig files so libfontconfig will be used and only install
|
||||
# a Gentoo specific one if fontconfig is disabled.
|
||||
# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html
|
||||
rm "${ddest}"/lib/fontconfig.* || die
|
||||
if ! use fontconfig; then
|
||||
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
|
||||
eprefixify "${T}"/fontconfig.properties
|
||||
insinto "${dest}"/lib/
|
||||
doins "${T}"/fontconfig.properties
|
||||
fi
|
||||
|
||||
set_java_env
|
||||
java-vm_revdep-mask
|
||||
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
|
||||
}
|
||||
@ -1,4 +1,3 @@
|
||||
DIST vala-0.18.1.tar.xz 2584924 SHA256 7f5e2e8ca03f9fa2cf13acaf93bfdc3a7ad0a10b000a337ba9c6bdc021bdca32 SHA512 e4459738b916d6b70c633844db3e0b0fed0f186d3f44cd3e4cac3c486a7d8b7a4bb0f58620b8b0c367f61bf6358a6b511edf924533eb8bb2ee49ac36069ee4db WHIRLPOOL 5d2907f175e3460def1f271be4db099d0d8d92e34739f893210302af7cc059cbcfb58d735b1fceaea2e905cda107d0a627b9071df285b768a5d7c9c7334a020e
|
||||
DIST vala-0.20.1.tar.xz 2627808 SHA256 9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481 SHA512 6246228815bcc042de0aeea3f4593c95b0d81fdfec8a4336a8e9178dd8a4a7013694a2cec543c3c49aad026d5d3597e194884b6cfecb10040db886afba9e72e1 WHIRLPOOL 91a7017c1801ebe29f5f9704b98e9bc65d26bb66122ef25f684da43dee116a2da5c9d7a91a1f73c5a7a580c9c8e5515f024a2b8ad615ae367faf37bef022f905
|
||||
DIST vala-0.22.1.tar.xz 2690324 SHA256 92c61b94a427f281ba2537b69135a3be23248b153268057d7195003dd6aba28c SHA512 e65f6d368d50264cdd497251ca6ebf8f0be21455afe5b9d74b146d58229f32e5906cfe323cef2cf4c6677e01fcbf599ab98852d4930df89cb69740b8fffacb34 WHIRLPOOL d3252642b35ab619f3b08dbda3ab4ef201b665c55682e122b4ffd1e5138d60a38b017ae20140de31372c9f61f20532a7a04d77f8cfe5ae04f93ea1c55338e09a
|
||||
DIST vala-0.24.0.tar.xz 2666032 SHA256 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c SHA512 a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479 WHIRLPOOL d19cdf123abc3689c84c3746729a1452a8a9051271aaa64782db226ab4c276e963fa574900b4d145577d4fd0329cb29f73782b5f67ac1650ad1bdf663096e88f
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.18.1.ebuild,v 1.13 2013/04/09 16:41:31 ago Exp $
|
||||
|
||||
EAPI="4"
|
||||
GCONF_DEBUG="no"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
|
||||
inherit gnome2
|
||||
|
||||
DESCRIPTION="Vala - Compiler for the GObject type system"
|
||||
HOMEPAGE="http://live.gnome.org/Vala"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0.18"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
|
||||
IUSE="test +vapigen"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.18:2
|
||||
>=dev-libs/vala-common-${PV}"
|
||||
DEPEND="${RDEPEND}
|
||||
!${CATEGORY}/${PN}:0
|
||||
dev-libs/libxslt
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
virtual/yacc
|
||||
test? (
|
||||
dev-libs/dbus-glib
|
||||
>=dev-libs/glib-2.26:2 )"
|
||||
|
||||
pkg_setup() {
|
||||
DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
|
||||
G2CONF="${G2CONF}
|
||||
--disable-unversioned
|
||||
$(use_enable vapigen)"
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/cloog-9999.ebuild,v 1.1 2014/11/01 15:43:55 blueness Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils multilib-minimal
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="git://repo.or.cz/cloog.git"
|
||||
KEYWORDS=""
|
||||
inherit autotools git-2
|
||||
else
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
|
||||
SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A loop generator for scanning polyhedra"
|
||||
HOMEPAGE="http://www.bastoul.net/cloog/index.php"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0/4"
|
||||
IUSE="static-libs"
|
||||
|
||||
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/isl-0.12.2:0/10[${MULTILIB_USEDEP}]
|
||||
!<dev-libs/cloog-ppl-0.15.10"
|
||||
DEPEND="${DEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
DOCS=( README )
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
./get_submodules.sh
|
||||
eautoreconf -i
|
||||
else
|
||||
# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
|
||||
# sed to avoid eautoreconf
|
||||
sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
--with-gmp=system \
|
||||
--with-isl=system \
|
||||
--with-osl=no \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
prune_libtool_files
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpc/mpc-1.0.2-r1.ebuild,v 1.1 2014/11/01 07:34:58 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils libtool multilib-minimal
|
||||
|
||||
DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
|
||||
HOMEPAGE="http://mpc.multiprecision.org/"
|
||||
SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="static-libs"
|
||||
|
||||
DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
|
||||
>=dev-libs/mpfr-2.4.2[${MULTILIB_USEDEP},static-libs?]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
elibtoolize #347317
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE=${S} econf $(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
prune_libtool_files
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
|
||||
--- mpfr-3.1.2-a/PATCHES 2014-04-15 21:56:49.609057464 +0000
|
||||
+++ mpfr-3.1.2-b/PATCHES 2014-04-15 21:56:49.697059857 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+li2-return
|
||||
diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
|
||||
--- mpfr-3.1.2-a/VERSION 2014-04-15 21:56:49.609057464 +0000
|
||||
+++ mpfr-3.1.2-b/VERSION 2014-04-15 21:56:49.697059857 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.2-p5
|
||||
+3.1.2-p6
|
||||
diff -Naurd mpfr-3.1.2-a/src/li2.c mpfr-3.1.2-b/src/li2.c
|
||||
--- mpfr-3.1.2-a/src/li2.c 2013-03-13 15:37:32.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/src/li2.c 2014-04-15 21:56:49.653058661 +0000
|
||||
@@ -630,5 +630,5 @@
|
||||
return mpfr_check_range (y, inexact, rnd_mode);
|
||||
}
|
||||
|
||||
- MPFR_ASSERTN (0); /* should never reach this point */
|
||||
+ MPFR_RET_NEVER_GO_HERE ();
|
||||
}
|
||||
diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
|
||||
--- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 21:56:49.609057464 +0000
|
||||
+++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 21:56:49.697059857 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 2
|
||||
-#define MPFR_VERSION_STRING "3.1.2-p5"
|
||||
+#define MPFR_VERSION_STRING "3.1.2-p6"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
|
||||
--- mpfr-3.1.2-a/src/version.c 2014-04-15 21:56:49.609057464 +0000
|
||||
+++ mpfr-3.1.2-b/src/version.c 2014-04-15 21:56:49.697059857 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.2-p5";
|
||||
+ return "3.1.2-p6";
|
||||
}
|
||||
@ -0,0 +1,71 @@
|
||||
diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
|
||||
--- mpfr-3.1.2-a/PATCHES 2014-04-15 22:04:57.090286262 +0000
|
||||
+++ mpfr-3.1.2-b/PATCHES 2014-04-15 22:04:57.162288198 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+exp3
|
||||
diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
|
||||
--- mpfr-3.1.2-a/VERSION 2014-04-15 22:04:57.086286154 +0000
|
||||
+++ mpfr-3.1.2-b/VERSION 2014-04-15 22:04:57.162288198 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.2-p6
|
||||
+3.1.2-p7
|
||||
diff -Naurd mpfr-3.1.2-a/src/exp3.c mpfr-3.1.2-b/src/exp3.c
|
||||
--- mpfr-3.1.2-a/src/exp3.c 2013-03-13 15:37:34.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/src/exp3.c 2014-04-15 22:04:57.126287230 +0000
|
||||
@@ -283,7 +283,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDD, MPFR_RNDZ,
|
||||
+ if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDN, MPFR_RNDZ,
|
||||
MPFR_PREC(y) + (rnd_mode == MPFR_RNDN)))
|
||||
{
|
||||
inexact = mpfr_set (y, shift_x > 0 ? t : tmp, rnd_mode);
|
||||
diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
|
||||
--- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 22:04:57.086286154 +0000
|
||||
+++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 22:04:57.162288198 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 2
|
||||
-#define MPFR_VERSION_STRING "3.1.2-p6"
|
||||
+#define MPFR_VERSION_STRING "3.1.2-p7"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
|
||||
--- mpfr-3.1.2-a/src/version.c 2014-04-15 22:04:57.090286262 +0000
|
||||
+++ mpfr-3.1.2-b/src/version.c 2014-04-15 22:04:57.162288198 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.2-p6";
|
||||
+ return "3.1.2-p7";
|
||||
}
|
||||
diff -Naurd mpfr-3.1.2-a/tests/texp.c mpfr-3.1.2-b/tests/texp.c
|
||||
--- mpfr-3.1.2-a/tests/texp.c 2013-03-13 15:37:44.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/tests/texp.c 2014-04-15 22:04:57.126287230 +0000
|
||||
@@ -150,6 +150,22 @@
|
||||
exit (1);
|
||||
}
|
||||
|
||||
+ mpfr_set_prec (x, 118);
|
||||
+ mpfr_set_str_binary (x, "0.1110010100011101010000111110011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E-86");
|
||||
+ mpfr_set_prec (y, 118);
|
||||
+ mpfr_exp_2 (y, x, MPFR_RNDU);
|
||||
+ mpfr_exp_3 (x, x, MPFR_RNDU);
|
||||
+ if (mpfr_cmp (x, y))
|
||||
+ {
|
||||
+ printf ("mpfr_exp_2 and mpfr_exp_3 differ for prec=118\n");
|
||||
+ printf ("mpfr_exp_2 gives ");
|
||||
+ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
|
||||
+ printf ("\nmpfr_exp_3 gives ");
|
||||
+ mpfr_out_str (stdout, 2, 0, x, MPFR_RNDN);
|
||||
+ printf ("\n");
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
mpfr_clear (x);
|
||||
mpfr_clear (y);
|
||||
return 0;
|
||||
@ -0,0 +1,254 @@
|
||||
diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
|
||||
--- mpfr-3.1.2-a/PATCHES 2014-04-15 22:20:32.243481506 +0000
|
||||
+++ mpfr-3.1.2-b/PATCHES 2014-04-15 22:22:32.418722707 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+gmp6-compat
|
||||
diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
|
||||
--- mpfr-3.1.2-a/VERSION 2014-04-15 22:20:20.755171478 +0000
|
||||
+++ mpfr-3.1.2-b/VERSION 2014-04-15 22:21:45.225450147 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.2-p7
|
||||
+3.1.2-p8
|
||||
diff -Naurd mpfr-3.1.2-a/configure mpfr-3.1.2-b/configure
|
||||
--- mpfr-3.1.2-a/configure 2013-03-13 15:38:20.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/configure 2014-04-15 22:21:38.821277476 +0000
|
||||
@@ -14545,26 +14545,30 @@
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
-if test "$use_gmp_build" = yes ; then
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for valid GMP_NUMB_BITS" >&5
|
||||
-$as_echo_n "checking for valid GMP_NUMB_BITS... " >&6; }
|
||||
- if test "$cross_compiling" = yes; then :
|
||||
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency" >&5
|
||||
+$as_echo_n "checking for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency... " >&6; }
|
||||
+if test "$cross_compiling" = yes; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: can't test" >&5
|
||||
$as_echo "can't test" >&6; }
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
+#include <stdio.h>
|
||||
#include <limits.h>
|
||||
#include "gmp.h"
|
||||
-#include "gmp-impl.h"
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
- return GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT
|
||||
- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
|
||||
+ if (GMP_NUMB_BITS == sizeof(mp_limb_t) * CHAR_BIT)
|
||||
+ return 0;
|
||||
+ fprintf (stderr, "GMP_NUMB_BITS = %ld\n", (long) GMP_NUMB_BITS);
|
||||
+ fprintf (stderr, "sizeof(mp_limb_t) = %ld\n", (long) sizeof(mp_limb_t));
|
||||
+ fprintf (stderr, "sizeof(mp_limb_t) * CHAR_BIT = %ld != GMP_NUMB_BITS\n",
|
||||
+ (long) (sizeof(mp_limb_t) * CHAR_BIT));
|
||||
+ return 1;
|
||||
|
||||
;
|
||||
return 0;
|
||||
@@ -14577,14 +14581,14 @@
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
- as_fn_error $? "GMP_NUMB_BITS is incorrect.
|
||||
-You probably need to change some of the GMP or MPFR compile options." "$LINENO" 5
|
||||
+ as_fn_error $? "GMP_NUMB_BITS and sizeof(mp_limb_t) are not consistent.
|
||||
+You probably need to change some of the GMP or MPFR compile options.
|
||||
+See 'config.log' for details (search for GMP_NUMB_BITS)." "$LINENO" 5
|
||||
fi
|
||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
||||
conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
fi
|
||||
|
||||
-fi
|
||||
|
||||
|
||||
if test "$dont_link_with_gmp" = yes ; then
|
||||
diff -Naurd mpfr-3.1.2-a/configure.ac mpfr-3.1.2-b/configure.ac
|
||||
--- mpfr-3.1.2-a/configure.ac 2013-03-13 15:37:46.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/configure.ac 2013-03-13 15:37:46.000000000 +0000
|
||||
@@ -435,23 +435,29 @@
|
||||
])
|
||||
fi
|
||||
|
||||
-dnl Check for valid GMP_NUMB_BITS and BYTES_PER_MP_LIMB
|
||||
+dnl Check for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency.
|
||||
+dnl Problems may occur if gmp.h was generated with some ABI
|
||||
+dnl and is used with another ABI (or if nails are used).
|
||||
dnl This test doesn't need to link with libgmp (at least it shouldn't).
|
||||
-if test "$use_gmp_build" = yes ; then
|
||||
- AC_MSG_CHECKING(for valid GMP_NUMB_BITS)
|
||||
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
|
||||
+AC_MSG_CHECKING(for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency)
|
||||
+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
|
||||
+#include <stdio.h>
|
||||
#include <limits.h>
|
||||
#include "gmp.h"
|
||||
-#include "gmp-impl.h"
|
||||
]], [[
|
||||
- return GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT
|
||||
- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
|
||||
+ if (GMP_NUMB_BITS == sizeof(mp_limb_t) * CHAR_BIT)
|
||||
+ return 0;
|
||||
+ fprintf (stderr, "GMP_NUMB_BITS = %ld\n", (long) GMP_NUMB_BITS);
|
||||
+ fprintf (stderr, "sizeof(mp_limb_t) = %ld\n", (long) sizeof(mp_limb_t));
|
||||
+ fprintf (stderr, "sizeof(mp_limb_t) * CHAR_BIT = %ld != GMP_NUMB_BITS\n",
|
||||
+ (long) (sizeof(mp_limb_t) * CHAR_BIT));
|
||||
+ return 1;
|
||||
]])], [AC_MSG_RESULT(yes)], [
|
||||
AC_MSG_RESULT(no)
|
||||
- AC_MSG_ERROR([GMP_NUMB_BITS is incorrect.
|
||||
-You probably need to change some of the GMP or MPFR compile options.])],
|
||||
+ AC_MSG_ERROR([GMP_NUMB_BITS and sizeof(mp_limb_t) are not consistent.
|
||||
+You probably need to change some of the GMP or MPFR compile options.
|
||||
+See 'config.log' for details (search for GMP_NUMB_BITS).])],
|
||||
[AC_MSG_RESULT([can't test])])
|
||||
-fi
|
||||
|
||||
|
||||
dnl We really need to link using libtool. But it is impossible with the current
|
||||
diff -Naurd mpfr-3.1.2-a/src/init2.c mpfr-3.1.2-b/src/init2.c
|
||||
--- mpfr-3.1.2-a/src/init2.c 2013-03-13 15:37:32.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/src/init2.c 2014-04-15 22:21:06.220398489 +0000
|
||||
@@ -30,11 +30,11 @@
|
||||
|
||||
/* Check if we can represent the number of limbs
|
||||
* associated to the maximum of mpfr_prec_t*/
|
||||
- MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/BYTES_PER_MP_LIMB) );
|
||||
+ MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/MPFR_BYTES_PER_MP_LIMB) );
|
||||
|
||||
- /* Check for correct GMP_NUMB_BITS and BYTES_PER_MP_LIMB */
|
||||
- MPFR_ASSERTN( GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT
|
||||
- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB );
|
||||
+ /* Check for correct GMP_NUMB_BITS and MPFR_BYTES_PER_MP_LIMB */
|
||||
+ MPFR_ASSERTN( GMP_NUMB_BITS == MPFR_BYTES_PER_MP_LIMB * CHAR_BIT
|
||||
+ && sizeof(mp_limb_t) == MPFR_BYTES_PER_MP_LIMB );
|
||||
|
||||
MPFR_ASSERTN (mp_bits_per_limb == GMP_NUMB_BITS);
|
||||
|
||||
diff -Naurd mpfr-3.1.2-a/src/mpfr-gmp.h mpfr-3.1.2-b/src/mpfr-gmp.h
|
||||
--- mpfr-3.1.2-a/src/mpfr-gmp.h 2013-03-13 15:37:32.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/src/mpfr-gmp.h 2014-04-15 22:21:06.220398489 +0000
|
||||
@@ -72,7 +72,6 @@
|
||||
#endif
|
||||
|
||||
/* Define some macros */
|
||||
-#define BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT)
|
||||
|
||||
#define MP_LIMB_T_MAX (~(mp_limb_t)0)
|
||||
|
||||
@@ -96,19 +95,19 @@
|
||||
#define SHRT_HIGHBIT SHRT_MIN
|
||||
|
||||
/* MP_LIMB macros */
|
||||
-#define MPN_ZERO(dst, n) memset((dst), 0, (n)*BYTES_PER_MP_LIMB)
|
||||
-#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB)
|
||||
-#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB)
|
||||
+#define MPN_ZERO(dst, n) memset((dst), 0, (n)*MPFR_BYTES_PER_MP_LIMB)
|
||||
+#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB)
|
||||
+#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB)
|
||||
#define MPN_COPY(dst,src,n) \
|
||||
do \
|
||||
{ \
|
||||
if ((dst) != (src)) \
|
||||
{ \
|
||||
MPFR_ASSERTD ((char *) (dst) >= (char *) (src) + \
|
||||
- (n) * BYTES_PER_MP_LIMB || \
|
||||
+ (n) * MPFR_BYTES_PER_MP_LIMB || \
|
||||
(char *) (src) >= (char *) (dst) + \
|
||||
- (n) * BYTES_PER_MP_LIMB); \
|
||||
- memcpy ((dst), (src), (n) * BYTES_PER_MP_LIMB); \
|
||||
+ (n) * MPFR_BYTES_PER_MP_LIMB); \
|
||||
+ memcpy ((dst), (src), (n) * MPFR_BYTES_PER_MP_LIMB); \
|
||||
} \
|
||||
} \
|
||||
while (0)
|
||||
diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h
|
||||
--- mpfr-3.1.2-a/src/mpfr-impl.h 2013-10-09 13:34:21.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/src/mpfr-impl.h 2014-04-15 22:21:06.220398489 +0000
|
||||
@@ -191,7 +191,7 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-
|
||||
+#define MPFR_BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT)
|
||||
|
||||
/******************************************************
|
||||
******************** Check GMP ***********************
|
||||
@@ -930,7 +930,7 @@
|
||||
#define MPFR_SET_ALLOC_SIZE(x, n) \
|
||||
( ((mp_size_t*) MPFR_MANT(x))[-1] = n)
|
||||
#define MPFR_MALLOC_SIZE(s) \
|
||||
- ( sizeof(mpfr_size_limb_t) + BYTES_PER_MP_LIMB * ((size_t) s) )
|
||||
+ ( sizeof(mpfr_size_limb_t) + MPFR_BYTES_PER_MP_LIMB * ((size_t) s) )
|
||||
#define MPFR_SET_MANT_PTR(x,p) \
|
||||
(MPFR_MANT(x) = (mp_limb_t*) ((mpfr_size_limb_t*) p + 1))
|
||||
#define MPFR_GET_REAL_PTR(x) \
|
||||
@@ -964,7 +964,7 @@
|
||||
#endif
|
||||
|
||||
#define MPFR_TMP_LIMBS_ALLOC(N) \
|
||||
- ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * BYTES_PER_MP_LIMB))
|
||||
+ ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * MPFR_BYTES_PER_MP_LIMB))
|
||||
|
||||
/* temporary allocate 1 limb at xp, and initialize mpfr variable x */
|
||||
/* The temporary var doesn't have any size field, but it doesn't matter
|
||||
diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
|
||||
--- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 22:20:20.755171478 +0000
|
||||
+++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 22:21:45.225450147 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 2
|
||||
-#define MPFR_VERSION_STRING "3.1.2-p7"
|
||||
+#define MPFR_VERSION_STRING "3.1.2-p8"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.2-a/src/mul.c mpfr-3.1.2-b/src/mul.c
|
||||
--- mpfr-3.1.2-a/src/mul.c 2013-03-13 15:37:37.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/src/mul.c 2014-04-15 22:21:06.224398597 +0000
|
||||
@@ -106,7 +106,7 @@
|
||||
MPFR_ASSERTD(tn <= k);
|
||||
|
||||
/* Check for no size_t overflow*/
|
||||
- MPFR_ASSERTD((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB);
|
||||
+ MPFR_ASSERTD((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB);
|
||||
MPFR_TMP_MARK(marker);
|
||||
tmp = MPFR_TMP_LIMBS_ALLOC (k);
|
||||
|
||||
@@ -301,7 +301,7 @@
|
||||
MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */
|
||||
|
||||
/* Check for no size_t overflow*/
|
||||
- MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB);
|
||||
+ MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB);
|
||||
MPFR_TMP_MARK (marker);
|
||||
tmp = MPFR_TMP_LIMBS_ALLOC (k);
|
||||
|
||||
diff -Naurd mpfr-3.1.2-a/src/stack_interface.c mpfr-3.1.2-b/src/stack_interface.c
|
||||
--- mpfr-3.1.2-a/src/stack_interface.c 2013-03-13 15:37:32.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/src/stack_interface.c 2014-04-15 22:21:06.220398489 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
size_t
|
||||
mpfr_custom_get_size (mpfr_prec_t prec)
|
||||
{
|
||||
- return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB;
|
||||
+ return MPFR_PREC2LIMBS (prec) * MPFR_BYTES_PER_MP_LIMB;
|
||||
}
|
||||
|
||||
#undef mpfr_custom_init
|
||||
diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
|
||||
--- mpfr-3.1.2-a/src/version.c 2014-04-15 22:20:20.755171478 +0000
|
||||
+++ mpfr-3.1.2-b/src/version.c 2014-04-15 22:21:45.225450147 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.2-p7";
|
||||
+ return "3.1.2-p8";
|
||||
}
|
||||
@ -0,0 +1,166 @@
|
||||
diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
|
||||
--- mpfr-3.1.2-a/PATCHES 2014-06-30 15:15:25.533266905 +0000
|
||||
+++ mpfr-3.1.2-b/PATCHES 2014-06-30 15:15:25.617269178 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+div-overflow
|
||||
diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
|
||||
--- mpfr-3.1.2-a/VERSION 2014-06-30 15:15:25.529266797 +0000
|
||||
+++ mpfr-3.1.2-b/VERSION 2014-06-30 15:15:25.617269178 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.2-p8
|
||||
+3.1.2-p9
|
||||
diff -Naurd mpfr-3.1.2-a/src/div.c mpfr-3.1.2-b/src/div.c
|
||||
--- mpfr-3.1.2-a/src/div.c 2013-03-13 15:37:33.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/src/div.c 2014-06-30 15:15:25.585268312 +0000
|
||||
@@ -750,7 +750,9 @@
|
||||
truncate_check_qh:
|
||||
if (qh)
|
||||
{
|
||||
- qexp ++;
|
||||
+ if (MPFR_LIKELY (qexp < MPFR_EXP_MAX))
|
||||
+ qexp ++;
|
||||
+ /* else qexp is now incorrect, but one will still get an overflow */
|
||||
q0p[q0size - 1] = MPFR_LIMB_HIGHBIT;
|
||||
}
|
||||
goto truncate;
|
||||
@@ -765,7 +767,9 @@
|
||||
inex = 1; /* always here */
|
||||
if (mpn_add_1 (q0p, q0p, q0size, MPFR_LIMB_ONE << sh))
|
||||
{
|
||||
- qexp ++;
|
||||
+ if (MPFR_LIKELY (qexp < MPFR_EXP_MAX))
|
||||
+ qexp ++;
|
||||
+ /* else qexp is now incorrect, but one will still get an overflow */
|
||||
q0p[q0size - 1] = MPFR_LIMB_HIGHBIT;
|
||||
}
|
||||
|
||||
diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
|
||||
--- mpfr-3.1.2-a/src/mpfr.h 2014-06-30 15:15:25.533266905 +0000
|
||||
+++ mpfr-3.1.2-b/src/mpfr.h 2014-06-30 15:15:25.613269070 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 2
|
||||
-#define MPFR_VERSION_STRING "3.1.2-p8"
|
||||
+#define MPFR_VERSION_STRING "3.1.2-p9"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
|
||||
--- mpfr-3.1.2-a/src/version.c 2014-06-30 15:15:25.533266905 +0000
|
||||
+++ mpfr-3.1.2-b/src/version.c 2014-06-30 15:15:25.613269070 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.2-p8";
|
||||
+ return "3.1.2-p9";
|
||||
}
|
||||
diff -Naurd mpfr-3.1.2-a/tests/tdiv.c mpfr-3.1.2-b/tests/tdiv.c
|
||||
--- mpfr-3.1.2-a/tests/tdiv.c 2013-03-13 15:37:44.000000000 +0000
|
||||
+++ mpfr-3.1.2-b/tests/tdiv.c 2014-06-30 15:15:25.585268312 +0000
|
||||
@@ -1104,6 +1104,96 @@
|
||||
#define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS)
|
||||
#include "tgeneric.c"
|
||||
|
||||
+static void
|
||||
+test_extreme (void)
|
||||
+{
|
||||
+ mpfr_t x, y, z;
|
||||
+ mpfr_exp_t emin, emax;
|
||||
+ mpfr_prec_t p[4] = { 8, 32, 64, 256 };
|
||||
+ int xi, yi, zi, j, r;
|
||||
+ unsigned int flags, ex_flags;
|
||||
+
|
||||
+ emin = mpfr_get_emin ();
|
||||
+ emax = mpfr_get_emax ();
|
||||
+
|
||||
+ mpfr_set_emin (MPFR_EMIN_MIN);
|
||||
+ mpfr_set_emax (MPFR_EMAX_MAX);
|
||||
+
|
||||
+ for (xi = 0; xi < 4; xi++)
|
||||
+ {
|
||||
+ mpfr_init2 (x, p[xi]);
|
||||
+ mpfr_setmax (x, MPFR_EMAX_MAX);
|
||||
+ MPFR_ASSERTN (mpfr_check (x));
|
||||
+ for (yi = 0; yi < 4; yi++)
|
||||
+ {
|
||||
+ mpfr_init2 (y, p[yi]);
|
||||
+ mpfr_setmin (y, MPFR_EMIN_MIN);
|
||||
+ for (j = 0; j < 2; j++)
|
||||
+ {
|
||||
+ MPFR_ASSERTN (mpfr_check (y));
|
||||
+ for (zi = 0; zi < 4; zi++)
|
||||
+ {
|
||||
+ mpfr_init2 (z, p[zi]);
|
||||
+ RND_LOOP (r)
|
||||
+ {
|
||||
+ mpfr_clear_flags ();
|
||||
+ mpfr_div (z, x, y, (mpfr_rnd_t) r);
|
||||
+ flags = __gmpfr_flags;
|
||||
+ MPFR_ASSERTN (mpfr_check (z));
|
||||
+ ex_flags = MPFR_FLAGS_OVERFLOW | MPFR_FLAGS_INEXACT;
|
||||
+ if (flags != ex_flags)
|
||||
+ {
|
||||
+ printf ("Bad flags in test_extreme on z = a/b"
|
||||
+ " with %s and\n",
|
||||
+ mpfr_print_rnd_mode ((mpfr_rnd_t) r));
|
||||
+ printf ("a = ");
|
||||
+ mpfr_dump (x);
|
||||
+ printf ("b = ");
|
||||
+ mpfr_dump (y);
|
||||
+ printf ("Expected flags:");
|
||||
+ flags_out (ex_flags);
|
||||
+ printf ("Got flags: ");
|
||||
+ flags_out (flags);
|
||||
+ printf ("z = ");
|
||||
+ mpfr_dump (z);
|
||||
+ exit (1);
|
||||
+ }
|
||||
+ mpfr_clear_flags ();
|
||||
+ mpfr_div (z, y, x, (mpfr_rnd_t) r);
|
||||
+ flags = __gmpfr_flags;
|
||||
+ MPFR_ASSERTN (mpfr_check (z));
|
||||
+ ex_flags = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT;
|
||||
+ if (flags != ex_flags)
|
||||
+ {
|
||||
+ printf ("Bad flags in test_extreme on z = a/b"
|
||||
+ " with %s and\n",
|
||||
+ mpfr_print_rnd_mode ((mpfr_rnd_t) r));
|
||||
+ printf ("a = ");
|
||||
+ mpfr_dump (y);
|
||||
+ printf ("b = ");
|
||||
+ mpfr_dump (x);
|
||||
+ printf ("Expected flags:");
|
||||
+ flags_out (ex_flags);
|
||||
+ printf ("Got flags: ");
|
||||
+ flags_out (flags);
|
||||
+ printf ("z = ");
|
||||
+ mpfr_dump (z);
|
||||
+ exit (1);
|
||||
+ }
|
||||
+ }
|
||||
+ mpfr_clear (z);
|
||||
+ } /* zi */
|
||||
+ mpfr_nextabove (y);
|
||||
+ } /* j */
|
||||
+ mpfr_clear (y);
|
||||
+ } /* yi */
|
||||
+ mpfr_clear (x);
|
||||
+ } /* xi */
|
||||
+
|
||||
+ set_emin (emin);
|
||||
+ set_emax (emax);
|
||||
+}
|
||||
+
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
{
|
||||
@@ -1130,6 +1220,7 @@
|
||||
test_20070603 ();
|
||||
test_20070628 ();
|
||||
test_generic (2, 800, 50);
|
||||
+ test_extreme ();
|
||||
|
||||
tests_end_mpfr ();
|
||||
return 0;
|
||||
@ -0,0 +1,138 @@
|
||||
diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
|
||||
--- mpfr-3.1.2-a/PATCHES 2014-06-30 15:17:53.337268149 +0000
|
||||
+++ mpfr-3.1.2-b/PATCHES 2014-06-30 15:17:53.417270314 +0000
|
||||
@@ -0,0 +1 @@
|
||||
+vasprintf
|
||||
diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
|
||||
--- mpfr-3.1.2-a/VERSION 2014-06-30 15:17:53.337268149 +0000
|
||||
+++ mpfr-3.1.2-b/VERSION 2014-06-30 15:17:53.413270206 +0000
|
||||
@@ -1 +1 @@
|
||||
-3.1.2-p9
|
||||
+3.1.2-p10
|
||||
diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
|
||||
--- mpfr-3.1.2-a/src/mpfr.h 2014-06-30 15:17:53.337268149 +0000
|
||||
+++ mpfr-3.1.2-b/src/mpfr.h 2014-06-30 15:17:53.413270206 +0000
|
||||
@@ -27,7 +27,7 @@
|
||||
#define MPFR_VERSION_MAJOR 3
|
||||
#define MPFR_VERSION_MINOR 1
|
||||
#define MPFR_VERSION_PATCHLEVEL 2
|
||||
-#define MPFR_VERSION_STRING "3.1.2-p9"
|
||||
+#define MPFR_VERSION_STRING "3.1.2-p10"
|
||||
|
||||
/* Macros dealing with MPFR VERSION */
|
||||
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
||||
diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c
|
||||
--- mpfr-3.1.2-a/src/vasprintf.c 2013-11-15 00:51:49.267334408 +0000
|
||||
+++ mpfr-3.1.2-b/src/vasprintf.c 2014-06-30 15:17:53.377269231 +0000
|
||||
@@ -884,14 +884,18 @@
|
||||
first digit, we want the exponent for radix two and the decimal
|
||||
point AFTER the first digit. */
|
||||
{
|
||||
- MPFR_ASSERTN (exp > MPFR_EMIN_MIN /4); /* possible overflow */
|
||||
+ /* An integer overflow is normally not possible since MPFR_EXP_MIN
|
||||
+ is twice as large as MPFR_EMIN_MIN. */
|
||||
+ MPFR_ASSERTN (exp > (MPFR_EXP_MIN + 3) / 4);
|
||||
exp = (exp - 1) * 4;
|
||||
}
|
||||
else
|
||||
/* EXP is the exponent for decimal point BEFORE the first digit, we
|
||||
want the exponent for decimal point AFTER the first digit. */
|
||||
{
|
||||
- MPFR_ASSERTN (exp > MPFR_EMIN_MIN); /* possible overflow */
|
||||
+ /* An integer overflow is normally not possible since MPFR_EXP_MIN
|
||||
+ is twice as large as MPFR_EMIN_MIN. */
|
||||
+ MPFR_ASSERTN (exp > MPFR_EXP_MIN);
|
||||
--exp;
|
||||
}
|
||||
}
|
||||
diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
|
||||
--- mpfr-3.1.2-a/src/version.c 2014-06-30 15:17:53.337268149 +0000
|
||||
+++ mpfr-3.1.2-b/src/version.c 2014-06-30 15:17:53.413270206 +0000
|
||||
@@ -25,5 +25,5 @@
|
||||
const char *
|
||||
mpfr_get_version (void)
|
||||
{
|
||||
- return "3.1.2-p9";
|
||||
+ return "3.1.2-p10";
|
||||
}
|
||||
diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c
|
||||
--- mpfr-3.1.2-a/tests/tsprintf.c 2013-11-15 00:51:49.267334408 +0000
|
||||
+++ mpfr-3.1.2-b/tests/tsprintf.c 2014-06-30 15:17:53.377269231 +0000
|
||||
@@ -1184,6 +1184,69 @@
|
||||
check_emax_aux (MPFR_EMAX_MAX);
|
||||
}
|
||||
|
||||
+static void
|
||||
+check_emin_aux (mpfr_exp_t e)
|
||||
+{
|
||||
+ mpfr_t x;
|
||||
+ char *s1, s2[256];
|
||||
+ int i;
|
||||
+ mpfr_exp_t emin;
|
||||
+ mpz_t ee;
|
||||
+
|
||||
+ MPFR_ASSERTN (e >= LONG_MIN);
|
||||
+ emin = mpfr_get_emin ();
|
||||
+ set_emin (e);
|
||||
+
|
||||
+ mpfr_init2 (x, 16);
|
||||
+ mpz_init (ee);
|
||||
+
|
||||
+ mpfr_setmin (x, e);
|
||||
+ mpz_set_si (ee, e);
|
||||
+ mpz_sub_ui (ee, ee, 1);
|
||||
+
|
||||
+ i = mpfr_asprintf (&s1, "%Ra", x);
|
||||
+ MPFR_ASSERTN (i > 0);
|
||||
+
|
||||
+ gmp_snprintf (s2, 256, "0x1p%Zd", ee);
|
||||
+
|
||||
+ if (strcmp (s1, s2) != 0)
|
||||
+ {
|
||||
+ printf ("Error in check_emin_aux for emin = %ld\n", (long) e);
|
||||
+ printf ("Expected %s\n", s2);
|
||||
+ printf ("Got %s\n", s1);
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ mpfr_free_str (s1);
|
||||
+
|
||||
+ i = mpfr_asprintf (&s1, "%Rb", x);
|
||||
+ MPFR_ASSERTN (i > 0);
|
||||
+
|
||||
+ gmp_snprintf (s2, 256, "1p%Zd", ee);
|
||||
+
|
||||
+ if (strcmp (s1, s2) != 0)
|
||||
+ {
|
||||
+ printf ("Error in check_emin_aux for emin = %ld\n", (long) e);
|
||||
+ printf ("Expected %s\n", s2);
|
||||
+ printf ("Got %s\n", s1);
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ mpfr_free_str (s1);
|
||||
+
|
||||
+ mpfr_clear (x);
|
||||
+ mpz_clear (ee);
|
||||
+ set_emin (emin);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+check_emin (void)
|
||||
+{
|
||||
+ check_emin_aux (-15);
|
||||
+ check_emin_aux (mpfr_get_emin ());
|
||||
+ check_emin_aux (MPFR_EMIN_MIN);
|
||||
+}
|
||||
+
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
@@ -1203,6 +1266,7 @@
|
||||
decimal ();
|
||||
mixed ();
|
||||
check_emax ();
|
||||
+ check_emin ();
|
||||
|
||||
#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
|
||||
locale_da_DK ();
|
||||
@ -0,0 +1,62 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-3.1.2_p10.ebuild,v 1.1 2014/11/01 07:24:34 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
|
||||
inherit eutils libtool multilib multilib-minimal
|
||||
|
||||
MY_PV=${PV/_p*}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
PLEVEL=${PV/*p}
|
||||
DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
|
||||
HOMEPAGE="http://www.mpfr.org/"
|
||||
SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="static-libs"
|
||||
|
||||
RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PLEVEL} != ${PV} ]] ; then
|
||||
local i
|
||||
for (( i = 1; i <= PLEVEL; ++i )) ; do
|
||||
epatch "${FILESDIR}"/${MY_PV}/patch$(printf '%02d' ${i})
|
||||
done
|
||||
fi
|
||||
find . -type f -exec touch -r configure {} +
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
|
||||
ECONF_SOURCE=${S} \
|
||||
user_redefine_cc=yes \
|
||||
econf \
|
||||
--docdir="\$(datarootdir)/doc/${PF}" \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
use static-libs || find "${ED}"/usr -name '*.la' -delete
|
||||
|
||||
# clean up html/license install
|
||||
pushd "${ED}"/usr/share/doc/${PF} >/dev/null
|
||||
dohtml *.html && rm COPYING* *.html || die
|
||||
popd >/dev/null
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 1)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 1)
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
DIST adodb-ext-504.zip 46159 SHA256 e067a73cccc5151843e364f9a0da7807ba9c8e411aaea773f53a811cae586b9f SHA512 eaeb2682454ffc957eba605595a4b388ea6bd6f2f4498118b3cce11679890fdec108c4b6d8e0373972ce940d21b9a198b1016784d574ba9ddc2b65f53fb306c3 WHIRLPOOL 0801b94a7da2a8e09941713b650069f9852bc65aa7bea883cb9e9768d41220746541894f232f2157c6643e8a8807e403f35fd49b403869e9152e47606c13067c
|
||||
@ -1,46 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-php/adodb-ext/adodb-ext-504-r3.ebuild,v 1.2 2014/08/10 20:59:14 slyfox Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PHP_EXT_NAME="adodb"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
|
||||
S="${WORKDIR}/adodb-${PV}"
|
||||
|
||||
inherit eutils php-ext-source-r2
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
DESCRIPTION="PHP extension providing up to 100% speedup by replacing parts of ADOdb with C code"
|
||||
HOMEPAGE="http://adodb.sourceforge.net/"
|
||||
SRC_URI="http://phplens.com/lens/dl/${P}.zip"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=dev-php/adodb-4.70"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip"
|
||||
|
||||
src_prepare() {
|
||||
if use php_targets_php5-3 ; then
|
||||
cd "${WORKDIR}/php5.3"
|
||||
edos2unix "${WORKDIR}/php5.3/adodb.c"
|
||||
epatch "${FILESDIR}/php53.patch"
|
||||
cd "${S}"
|
||||
fi
|
||||
php-ext-source-r2_src_prepare
|
||||
}
|
||||
|
||||
src_install() {
|
||||
php-ext-source-r2_src_install
|
||||
|
||||
dodir "${PHP_EXT_SHARED_DIR}"
|
||||
insinto "${PHP_EXT_SHARED_DIR}"
|
||||
doins test-adodb.php
|
||||
|
||||
dodoc CREDITS README.txt
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
--- a/adodb.c 2005-11-25 20:00:56.000000000 +0100
|
||||
+++ b/adodb.c 2011-03-06 22:27:06.000000000 +0100
|
||||
@@ -159,11 +159,7 @@
|
||||
|
||||
static void adodb_init_zval(zval *v, char *s)
|
||||
{
|
||||
- v->type = IS_STRING;
|
||||
- v->value.str.val = s;
|
||||
- v->value.str.len = strlen(s);
|
||||
- v->is_ref = 0;
|
||||
- v->refcount = 1;
|
||||
+ ZVAL_STRING(v, s, 0);
|
||||
}
|
||||
|
||||
/* {{{ PHP_MINIT_FUNCTION
|
||||
@@ -277,7 +273,7 @@
|
||||
fci.function_table = EG(function_table);
|
||||
fci.function_name = &adodb_zvals[zval_ocifetch];
|
||||
fci.symbol_table = NULL;
|
||||
- fci.object_pp = NULL;
|
||||
+ /* fci.object_pp = NULL; */
|
||||
fci.retval_ptr_ptr = &retval;
|
||||
fci.param_count = 2;
|
||||
fci.params = ¶ms[1];
|
||||
@ -1 +0,0 @@
|
||||
DIST eaccelerator-0.9.6.1.tar.bz2 106049 SHA256 33703ad1678cdb65ef0cd28fbd2e262ef5d9f201f9016de26b7254987deba53c SHA512 974df80a5d59316424fa38dd7b7a0447d7a592d471aa09174bf4b1600d3593d891ba0cd4472a92b763dbc24bf63c8052392664f94cea2009605f636932ee0860 WHIRLPOOL 6a8abdfcd96b3f7a2f5e5b5c8bea7d8038b7b9027c02f5a09fa5753c73e089f13c030429c2f7d14b2df690dcbfe3fe9f7eeff7dc7dc303ab5eeb0f68ec965873
|
||||
@ -1,99 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-php/eaccelerator/eaccelerator-0.9.6.1-r5.ebuild,v 1.6 2014/08/10 20:59:34 slyfox Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
PHP_EXT_NAME="eaccelerator"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
|
||||
[[ -z "${EACCELERATOR_CACHEDIR}" ]] && EACCELERATOR_CACHEDIR="/var/cache/eaccelerator-php5/"
|
||||
|
||||
inherit php-ext-source-r2 eutils depend.apache user
|
||||
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DESCRIPTION="A PHP Accelerator & Encoder"
|
||||
HOMEPAGE="http://www.eaccelerator.net/"
|
||||
SRC_URI="http://bart.eaccelerator.net/source/${PV}/${P}.tar.bz2"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="debug disassembler inode doccommentinclusion session"
|
||||
|
||||
DEPEND="!dev-php/pecl-apc !dev-php/xcache"
|
||||
RDEPEND="${DEPEND}
|
||||
>=dev-lang/php-5.1[zlib,session?]
|
||||
virtual/httpd-php
|
||||
"
|
||||
|
||||
# Webserver user and group, here for Apache by default
|
||||
HTTPD_USER="${HTTPD_USER:-apache}"
|
||||
HTTPD_GROUP="${HTTPD_GROUP:-apache}"
|
||||
|
||||
want_apache
|
||||
|
||||
pkg_setup() {
|
||||
depend.apache_pkg_setup
|
||||
|
||||
if ! use apache2 ; then
|
||||
if [[ ${HTTPD_USER} == "apache" ]] || [[ ${HTTPD_GROUP} == "apache" ]] ; then
|
||||
eerror "You did not enable apache2 USE flag, so you need to define"
|
||||
eerror "the user and group that will be used for ${PN} yourself."
|
||||
eerror
|
||||
eerror "This should (generally) match the user and group that your webserver uses, e.g.:"
|
||||
eerror "HTTPD_USER=\"lighttpd\" HTTPD_GROUP=\"lighttpd\" if using www-servers/lighttpd"
|
||||
eerror
|
||||
die "Either enable USE=\"apache2\" or re-emerge this with HTTPD_USER and HTTPD_GROUP set"
|
||||
else
|
||||
enewgroup ${HTTPD_GROUP}
|
||||
enewuser ${HTTPD_USER} -1 -1 /var/www ${HTTPD_GROUP}
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/eaccelerator-openbasedir.patch"
|
||||
php-ext-source-r2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
my_conf="--enable-eaccelerator=shared --with-eaccelerator-userid=`id -u ${HTTPD_USER}`"
|
||||
use debug && my_conf="${my_conf} --with-eaccelerator-debug"
|
||||
use disassembler && my_conf="${my_conf} --with-eaccelerator-disassembler"
|
||||
! use inode && my_conf="${my_conf} --without-eaccelerator-use-inode"
|
||||
use doccommentinclusion && my_conf="${my_conf} --with-eaccelerator-doc-comment-inclusion"
|
||||
php-ext-source-r2_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
php-ext-source-r2_src_install
|
||||
|
||||
keepdir "${EACCELERATOR_CACHEDIR}"
|
||||
fowners ${HTTPD_USER}:${HTTPD_GROUP} "${EACCELERATOR_CACHEDIR}"
|
||||
fperms 750 "${EACCELERATOR_CACHEDIR}"
|
||||
|
||||
insinto "/usr/share/${PF}"
|
||||
doins PHP_Highlight.php control.php bugreport.php doc/php/info.php
|
||||
use disassembler && doins doc/php/dasm.php
|
||||
dodoc AUTHORS ChangeLog NEWS README
|
||||
|
||||
php-ext-source-r2_addtoinifiles "eaccelerator.shm_size" '"28"'
|
||||
php-ext-source-r2_addtoinifiles "eaccelerator.cache_dir" "\"${EACCELERATOR_CACHEDIR}\""
|
||||
php-ext-source-r2_addtoinifiles "eaccelerator.enable" '"1"'
|
||||
php-ext-source-r2_addtoinifiles "eaccelerator.optimizer" '"1"'
|
||||
php-ext-source-r2_addtoinifiles "eaccelerator.debug" '"0"'
|
||||
php-ext-source-r2_addtoinifiles ";eaccelerator.log_file" '"/var/log/eaccelerator_log"'
|
||||
php-ext-source-r2_addtoinifiles "eaccelerator.check_mtime" '"1"'
|
||||
php-ext-source-r2_addtoinifiles "eaccelerator.filter" '""'
|
||||
php-ext-source-r2_addtoinifiles "eaccelerator.shm_ttl" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "eaccelerator.shm_prune_period" '"0"'
|
||||
php-ext-source-r2_addtoinifiles "eaccelerator.shm_only" '"0"'
|
||||
php-ext-source-r2_addtoinifiles ";eaccelerator.allowed_admin_path" '"/path/where/admin/files/shall/be/allowed"'
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Please see the files in ${ROOT}usr/share/${PF}/ for some"
|
||||
elog "examples and informations on how to use the functions that"
|
||||
elog "eAccelerator adds to PHP."
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
Fixes issue with open_basedir
|
||||
Gentoo bug: 356425
|
||||
Upstream bug: http://eaccelerator.net/ticket/396
|
||||
|
||||
--- eaccelerator.c.old 2010-05-31 23:21:14.000000000 +0300
|
||||
+++ eaccelerator.c 2010-09-23 10:42:11.218144970 +0300
|
||||
@@ -864,7 +864,7 @@
|
||||
EACCELERATOR_PROTECT();
|
||||
if (p != NULL && p->op_array != NULL) {
|
||||
/* only restore file when open_basedir allows it */
|
||||
- if (php_check_open_basedir(realname TSRMLS_CC)) {
|
||||
+ if (php_check_open_basedir(p->realfilename TSRMLS_CC)) {
|
||||
return NULL;
|
||||
}
|
||||
EAG(class_entry) = NULL;
|
||||
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>php</herd>
|
||||
<use>
|
||||
<flag name="disassembler">Enable the eA disassembler</flag>
|
||||
<flag name="inode">Use inode-based caching</flag>
|
||||
<flag name="doccommentinclusion">If you want eAccelerator to retain
|
||||
doc-comments in internal php structures.</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
@ -1,2 +0,0 @@
|
||||
DIST APC-3.1.13.tgz 171591 SHA256 5ef8ba07729e72946e95951672a5378bed98cb5a294e79bf0f0a97ac62829abd SHA512 4ccfa12a61a9276be207c9b70b108b725cf2faa3ed805bab8c9a39b04039fd16a8da6919ab7d5a84592f7b4a7827dcd9adeb154c6a04d208e7071be22268b332 WHIRLPOOL 335020f6ec44ec188b9544fb4132d2c1c62c4d342c3e07f3bfb0266c3827c311316c95ec08517946481724350314a06e7f3b49b13c0cedf2a2dcd1ca5d38149e
|
||||
DIST APC-3.1.9.tgz 155540 SHA256 47def118d9da1a68521e1c9b3dd6660cf94be638ebecad010bdd7d7ca482d671 SHA512 dd4ab9e1d130e757117bb5a43eb2155dcd58d7e15f94add85834d2d488de9a2f8cacd4d5bee222302a2e651f17ecd750b227dd2d4ae7102932208bbc24a132f0 WHIRLPOOL 63354d4c6836378a211f3f22110dcbd452b58a13431b9d2fe227fd5d0c950ec764420922968d75cb43f4d085c21f7dc26245f1a14a30eb88534df6f6cf128a36
|
||||
@ -1,11 +0,0 @@
|
||||
apc.enabled="1"
|
||||
apc.shm_segments="1"
|
||||
apc.shm_size="30M"
|
||||
apc.mmap_file_mask="/tmp/apcphp5.XXXXXX"
|
||||
apc.file_update_protection="2"
|
||||
apc.enable_cli="0"
|
||||
apc.max_file_size="1M"
|
||||
apc.stat="1"
|
||||
apc.write_lock="1"
|
||||
apc.include_once_override="0"
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>php</herd>
|
||||
<use>
|
||||
<flag name="lock_semaphore">Enable semaphore locks instead of fcntl</flag>
|
||||
<flag name="lock_pthreadmutex">Enable pthread mutex locking</flag>
|
||||
<flag name="lock_pthreadrw">Enable pthread read/write locking</flag>
|
||||
<flag name="lock_spinlock">Enable spin locks (EXPERIMENTAL)</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
@ -1,67 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.13.ebuild,v 1.5 2014/08/10 21:00:46 slyfox Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
PHP_EXT_NAME="apc"
|
||||
PHP_EXT_PECL_PKG="APC"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
|
||||
|
||||
PHP_EXT_INIFILE="${PN}.ini"
|
||||
|
||||
USE_PHP="php5-3 php5-4"
|
||||
|
||||
inherit php-ext-pecl-r2 confutils eutils
|
||||
|
||||
KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
|
||||
|
||||
DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code"
|
||||
LICENSE="PHP-3.01"
|
||||
SLOT="0"
|
||||
IUSE="mmap"
|
||||
|
||||
DEPEND="
|
||||
!dev-php/eaccelerator
|
||||
!dev-php/xcache
|
||||
!dev-php/pecl-apcu
|
||||
!dev-php/pecl-zendopcache"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
LOCKS="pthreadmutex pthreadrw spinlock semaphore"
|
||||
|
||||
LUSE=""
|
||||
for l in ${LOCKS}; do
|
||||
LUSE+="lock_${l} "
|
||||
done
|
||||
|
||||
IUSE+=" ${LUSE/lock_pthreadmutex/+lock_pthreadmutex}"
|
||||
|
||||
REQUIRED_USE="^^ ( $LUSE )"
|
||||
|
||||
src_configure() {
|
||||
my_conf="--enable-apc"
|
||||
enable_extension_enable "apc-mmap" "mmap" 0
|
||||
|
||||
enable_extension_enable "apc-pthreadmutex" "lock_pthreadmutex" 0
|
||||
enable_extension_enable "apc-pthreadrwlocks" "lock_pthreadrw" 0
|
||||
enable_extension_enable "apc-spinlocks" "lock_spinlock" 0
|
||||
enable_extension_enable "apc-sem" "lock_semaphore" 0
|
||||
|
||||
php-ext-source-r2_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
php-ext-pecl-r2_src_install
|
||||
|
||||
dodir "${PHP_EXT_SHARED_DIR}"
|
||||
insinto "${PHP_EXT_SHARED_DIR}"
|
||||
doins apc.php
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "The apc.php file shipped with this release of PECL-APC was"
|
||||
elog "installed into ${PHP_EXT_SHARED_DIR}/."
|
||||
}
|
||||
@ -1,65 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-apc/pecl-apc-3.1.9-r2.ebuild,v 1.10 2014/08/10 21:00:46 slyfox Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
PHP_EXT_NAME="apc"
|
||||
PHP_EXT_PECL_PKG="APC"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
|
||||
|
||||
PHP_EXT_INIFILE="${PN}.ini"
|
||||
|
||||
inherit php-ext-pecl-r2 confutils eutils
|
||||
|
||||
KEYWORDS="amd64 ppc ~ppc64 x86"
|
||||
|
||||
DESCRIPTION="A free, open, and robust framework for caching and optimizing PHP code"
|
||||
LICENSE="PHP-3.01"
|
||||
SLOT="0"
|
||||
IUSE="mmap"
|
||||
|
||||
DEPEND="
|
||||
!dev-php/eaccelerator
|
||||
!dev-php/xcache
|
||||
!dev-php/pecl-apcu
|
||||
!dev-php/pecl-zendopcache"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
LOCKS="pthreadmutex pthreadrw spinlock semaphore"
|
||||
|
||||
LUSE=""
|
||||
for l in ${LOCKS}; do
|
||||
LUSE+="lock_${l} "
|
||||
done
|
||||
|
||||
IUSE+=" ${LUSE/lock_pthreadmutex/+lock_pthreadmutex}"
|
||||
|
||||
REQUIRED_USE="^^ ( $LUSE )"
|
||||
|
||||
src_configure() {
|
||||
my_conf="--enable-apc"
|
||||
enable_extension_enable "apc-mmap" "mmap" 0
|
||||
|
||||
enable_extension_enable "apc-pthreadmutex" "lock_pthreadmutex" 0
|
||||
enable_extension_enable "apc-pthreadrwlocks" "lock_pthreadrw" 0
|
||||
enable_extension_enable "apc-spinlocks" "lock_spinlock" 0
|
||||
enable_extension_enable "apc-sem" "lock_semaphore" 0
|
||||
|
||||
php-ext-source-r2_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
php-ext-pecl-r2_src_install
|
||||
|
||||
dodir "${PHP_EXT_SHARED_DIR}"
|
||||
insinto "${PHP_EXT_SHARED_DIR}"
|
||||
doins apc.php
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "The apc.php file shipped with this release of PECL-APC was"
|
||||
elog "installed into ${PHP_EXT_SHARED_DIR}/."
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue