diff --git a/app-admin/ranpwd/ranpwd-1.2.ebuild b/app-admin/ranpwd/ranpwd-1.2.ebuild index e3f81c1187e4..206cbc8f7302 100644 --- a/app-admin/ranpwd/ranpwd-1.2.ebuild +++ b/app-admin/ranpwd/ranpwd-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ranpwd/ranpwd-1.2.ebuild,v 1.6 2010/04/15 21:23:22 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/ranpwd/ranpwd-1.2.ebuild,v 1.7 2012/11/07 13:36:29 blueness Exp $ EAPI=3 @@ -10,7 +10,7 @@ SRC_URI="mirror://kernel/software/utils/admin/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ia64 ppc ppc64 ~x86" IUSE="" DEPEND="" diff --git a/app-crypt/gpgme/gpgme-1.3.2.ebuild b/app-crypt/gpgme/gpgme-1.3.2.ebuild index 80f33a51fa67..2fcfc942c4f8 100644 --- a/app-crypt/gpgme/gpgme-1.3.2.ebuild +++ b/app-crypt/gpgme/gpgme-1.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.2.ebuild,v 1.3 2012/11/07 05:18:31 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.2.ebuild,v 1.4 2012/11/07 11:55:03 blueness Exp $ EAPI="4" @@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" IUSE="common-lisp static-libs" DEPEND="app-crypt/gnupg diff --git a/app-crypt/keynote/files/keynote-2.3-qa.patch b/app-crypt/keynote/files/keynote-2.3-qa.patch new file mode 100644 index 000000000000..f6b1ff28cdb8 --- /dev/null +++ b/app-crypt/keynote/files/keynote-2.3-qa.patch @@ -0,0 +1,44 @@ +Respect CFLAGS, LDFLAGS, and AR. + +The better way to fix AR would be to patch configure.in, +but it is sufficiently old to fail with current autotools. +--- Makefile.in ++++ Makefile.in +@@ -27,7 +27,6 @@ + YACC = @YACC@ + SSLEAY = @SSLEAY@ + RM = @RM@ +-AR = @AR@ + NROFF = @NROFF@ + TAR = @TAR@ + TRUE = @TRUE@ +@@ -41,10 +40,10 @@ + YACCFLAGS = -d -p kn -b k + LEXFLAGS2 = -Pkv -s -i + LEXFLAGS = -Cr -Pkn -s -i +-CFLAGS = -O2 -Wall # -g + RMFLAGS2 = -rf + RMFLAGS = -f + NROFFFLAGS = -mandoc ++LDFLAGS = @LDFLAGS@ + + SSLCONF = testsuite/openssl.cnf + SSLCERT = testsuite/test.cert.pem +@@ -83,7 +82,7 @@ + $(RANLIB) $(TARGET) + + $(TARGET2): $(TARGET) $(OBJS2) +- $(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS) + + k.tab.c: keynote.y header.h keynote.h assertion.h config.h + $(YACC) $(YACCFLAGS) keynote.y +@@ -131,7 +130,7 @@ + -keyout $(SSLKEY) + + test-sample: all $(OBJS3) +- $(CC) $(CFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS) + + test-sig: all $(SSLCERT) $(SSLKEY) + $(SED) -e 's/--.*//' < $(SSLCERT) > $(SSLCERT).1 diff --git a/app-crypt/keynote/keynote-2.3-r3.ebuild b/app-crypt/keynote/keynote-2.3-r3.ebuild new file mode 100644 index 000000000000..c5b69b28ad4a --- /dev/null +++ b/app-crypt/keynote/keynote-2.3-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/keynote/keynote-2.3-r3.ebuild,v 1.1 2012/11/07 13:17:51 kensington Exp $ + +EAPI=5 + +inherit eutils toolchain-funcs + +DESCRIPTION="The KeyNote Trust-Management System" +HOMEPAGE="http://www1.cs.columbia.edu/~angelos/keynote.html" +SRC_URI="http://www1.cs.columbia.edu/~angelos/Code/${P}.tar.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ssl" + +RDEPEND="ssl? ( dev-libs/openssl )" +DEPEND="${RDEPEND} + virtual/yacc" + +pkg_setup() { + tc-export AR CC RANLIB +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-qa.patch + epatch "${FILESDIR}"/${P}-parallel-build.patch +} + +src_compile() { + if use ssl; then + emake + else + emake nocrypto + fi +} + +src_install() { + dobin keynote + + dolib.a libkeynote.a + + insinto /usr/include + doins keynote.h + + doman man/keynote.[1345] + dodoc README HOWTO.add.crypto TODO +} diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest index 1552142aa092..9d6dfb0c7015 100644 --- a/app-emulation/bochs/Manifest +++ b/app-emulation/bochs/Manifest @@ -1,3 +1,4 @@ DIST bochs-2.4.1.tar.gz 4046505 SHA256 d4fd63e328870d8a9452d8397c83a295b093d5d158386d1ef9b98f161f520ab3 SHA512 7f666be6c6628709eeb423ccdd5fb4360a81a112dc7ac78c99fca3bd8e01f9ff84b2967f5ca2aebd96fcc9758ca68c745693d9c4fabbd65307eaf719988917ca WHIRLPOOL 20d208a3337349f4896a4ba3adcbc563d494ca3e5ff762d9fd56dc4d68440f07337ed83c8a3cb6b4a5af070ade735239a6f016e00570644cd9576d8153bcf9bd DIST bochs-2.4.5.tar.gz 4059598 SHA256 b948622a364c2e7da4221a6a4640ba2efa68422e1411ac377c69d37f46f67616 SHA512 dbd5aa4a22f95c6d55cafa1b4e96c8a8da5e09acc29e14f6b689c44a853198fa0c23c414a7f5cb59e5e7172b67b1e281b8b8dce2b58416c53b5aec1f2afac6c1 WHIRLPOOL 91c25832fc92cbd18c9da40773379af6a47f7aa22b66c12fc07de817eaf9501be549e59041676eb2d9d2970dc0e1a6c83047a827c8d8eb59924a41013ed0bf73 +DIST bochs-2.6.tar.gz 4212828 SHA256 65123e44a6d2c1148d741da025d16311b9ccd600ef268b911aba73c67eaf86e1 SHA512 506e7816c96caf56005c74df20d243aef111dded41b65dbf440844af3d49bc5987af333ef65a53f90de9fbdfc4d18e3e23fff1157ccb08bd95afff8fdbbcfba3 WHIRLPOOL 4598ad37b6792a001e3301770318c6a6d53bda98dc9a21337db4659573d8bf4ec64cf3376386f5e298dc25813c9bcc5e29b7a82383b96c1e2f82c77a75877001 DIST dlxlinux4.tar.gz 1504868 SHA256 68b35f850ce69f4050ed85064e15d756245d57e84ddc1d52678b0e2a97dbf73e SHA512 e390aa2f264a456f05c587080e9b6f97ef44ba53345bfc716cd2aa6b274c4850bc6504239c0a2cbb63a711a358722a4130551ce1f7c25322ef2f7d0120d92e2f WHIRLPOOL 8dcd03c062baaacb6c8ce5f5c49903341f4ef70fad5d5804e963b649c593360fb58dbafa0b7fc6517c43733baf9674398d05093a53cbd307cc3204a18ff809b8 diff --git a/app-emulation/bochs/bochs-2.6.ebuild b/app-emulation/bochs/bochs-2.6.ebuild new file mode 100644 index 000000000000..31471af72ed9 --- /dev/null +++ b/app-emulation/bochs/bochs-2.6.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/bochs/bochs-2.6.ebuild,v 1.1 2012/11/07 14:17:25 lu_zero Exp $ + +EAPI=4 + +WX_GTK_VER=2.8 + +inherit eutils wxwidgets + +DESCRIPTION="LGPL-ed pc emulator" +HOMEPAGE="http://bochs.sourceforge.net/" +SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp wxwidgets vnc X +x86-64" +REQUIRED_USE="avx? ( x86-64 ) + gdb? ( !debugger !smp ) + debugger? ( !gdb )" + +RDEPEND="X? ( x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXpm ) + sdl? ( media-libs/libsdl ) + svga? ( media-libs/svgalib ) + wxwidgets? ( x11-libs/wxGTK:2.8[X] ) + readline? ( sys-libs/readline ) + ncurses? ( sys-libs/ncurses )" + +DEPEND="${RDEPEND} + doc? ( app-text/docbook-sgml-utils ) + X? ( x11-proto/xproto ) + sys-apps/sed + >=app-text/opensp-1.5" + +src_prepare() { + sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \ + Makefile.in || die +} + +src_configure() { + use wxwidgets && \ + need-wxwidgets unicode + + econf \ + --enable-all-optimizations \ + --enable-idle-hack \ + --enable-cdrom \ + --enable-clgd54xx \ + --enable-cpu-level=6 \ + --enable-disasm \ + --enable-e1000 \ + --enable-gameport \ + --enable-iodebug \ + --enable-monitor-mwait \ + --enable-ne2000 \ + --enable-plugins \ + --enable-pci \ + --enable-pcidev \ + --enable-pnic \ + --enable-raw-serial \ + --enable-sb16=linux \ + --enable-usb \ + --enable-usb-ohci \ + --enable-usb-xhci \ + --prefix=/usr \ + --with-nogui \ + $(use_enable 3dnow) \ + $(use_enable avx) \ + $(use_enable debugger) \ + $(use_enable doc docbook) \ + $(use_enable gdb gdb-stub) \ + $(use_enable readline) \ + $(use_enable smp) \ + $(use_enable x86-64) \ + $(use_with ncurses term) \ + $(use_with sdl) \ + $(use_with svga) \ + $(use_with vnc rfb) \ + $(use_with wxwidgets wx) \ + $(use_with X x) \ + $(use_with X x11) \ + ${myconf} +} diff --git a/app-emulation/bochs/metadata.xml b/app-emulation/bochs/metadata.xml index 03a27eca1430..0c208d93633b 100644 --- a/app-emulation/bochs/metadata.xml +++ b/app-emulation/bochs/metadata.xml @@ -6,5 +6,9 @@ Enable the bochs debugger + Enable support for Advanced Vector Extensions (AVX) + Enable debugger (slows down emulation) + Enable support for the remote GDB stub + Enable support for emulation of 64-bit CPUs diff --git a/app-misc/screen/screen-4.0.3-r5.ebuild b/app-misc/screen/screen-4.0.3-r6.ebuild similarity index 98% rename from app-misc/screen/screen-4.0.3-r5.ebuild rename to app-misc/screen/screen-4.0.3-r6.ebuild index 736e296b25ca..9752e34fdaf1 100644 --- a/app-misc/screen/screen-4.0.3-r5.ebuild +++ b/app-misc/screen/screen-4.0.3-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r5.ebuild,v 1.11 2012/11/06 19:15:19 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r6.ebuild,v 1.1 2012/11/07 16:04:41 jlec Exp $ EAPI=4 diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest index e634c6a705d8..827bc0b1700c 100644 --- a/app-office/texmaker/Manifest +++ b/app-office/texmaker/Manifest @@ -1,4 +1,5 @@ DIST texmaker-3.1.tar.bz2 6018840 SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78 SHA512 5fa2ad28198f712a73b41b1bc296ad8267182a59e1d5631336c20f527c8f88178e6fbd9fc8a40ef8559283c0b6e548c9d29c9e038c0b382cf60ad28a4057d811 WHIRLPOOL 94e80c3d345e478ace202f9c3b8af17b2966681f5dd94361704d48d1c2617f72596f75b769a8baed4bf06692dae8ca651da34e75751e03316077b178d16e864b DIST texmaker-3.3.4.tar.bz2 13028203 SHA256 db9aa4d2633e6ad96ff4b0d893205d42c2220928f021c210146a41ecf87525f5 SHA512 014bfbe2a72aa2aef8d71972526959116a8dc39852475ea8e9da0d0fbbc4e8441c04b124be93911a0b637436f94ecab730150064f2bb3842e6566cd26116c28e WHIRLPOOL fb0a5d150ac463905b0c243e4402858e0142c42f1278f185e678e48a690369830a75848b342f0f22c3db6495580ee03eb65cbcf989bad52b63f87371d660970d DIST texmaker-3.5.1.tar.bz2 13168917 SHA256 2477ec15d4b3a3c442735504deddd50f17f9194708013e690ebcc8b278d7b659 SHA512 0c0eb5e58cba3e88da1ed98bbeee547ad2ad9e0c2502c1b236bccbc98b5cf66c92b9656f290965ee0f0e28365ada6bdf239fa0a377037d30a13f130da31cc45b WHIRLPOOL 927579dfedea9d998cc0130a519dea32aa4fc587e300f1126ab1ab612e2b704ae5237a01d9a54ee328bbb05b2fecc3c2372f8f72d992163db9975aec451eb2df +DIST texmaker-3.5.2.tar.bz2 13165580 SHA256 5ffc96d64befa07656ee82e4f3cfc95a84d73759607d0229e864899d7629f312 SHA512 e81d553938102ec895641fbda364a5ad3d0cd09ddf0a0c3cc6c9034da67477711c01bcd13ca0b4daad78030513b5a2957dee021646efd4b9f2a22b9aea0fbe5b WHIRLPOOL 19ee0b138579f759f7eac29fe1976d5e8354c30719c4f0d29941f5d0aad41d29b4010c7eba77461f2051554dc05415feeead02d0d41637aa14bf757416293954 DIST texmaker-3.5.tar.bz2 13144036 SHA256 eddc8a60afc5f53d1f31154a2f0b6a60b8a1c3bd09dad1e8eaf5868231dfbcf0 SHA512 ae1c6491ed91863a7ecf2bcdcdf19832fb53a0c82e66e79825ef0d3e21300b3239550117aba75373303ca0eea448487434afce311c3a37d57a5ccb3f892d232a WHIRLPOOL 174c8ff38f643216b1367d60c6f48dcc684e3b409e37bcba534dbc5c84cfc52c75978f68652d6743c644ec8764409946ef9e7fd0e555cec0aadd5e84a1318d3f diff --git a/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch new file mode 100644 index 000000000000..b7f094d9cd34 --- /dev/null +++ b/app-office/texmaker/files/texmaker-3.5.2-hunspell.patch @@ -0,0 +1,146 @@ + latexeditor.h | 2 +- + latexeditorview.h | 2 +- + latexhighlighter.h | 2 +- + spellerdialog.h | 2 +- + texmaker.h | 2 +- + texmaker.pro | 40 +++++----------------------------------- + 6 files changed, 10 insertions(+), 40 deletions(-) + +diff --git a/latexeditor.h b/latexeditor.h +index 1ad4195..8f43b61 100644 +--- a/latexeditor.h ++++ b/latexeditor.h +@@ -33,7 +33,7 @@ + + #include "latexhighlighter.h" + #include "textblockselection.h" +-#include "hunspell/hunspell.hxx" ++#include + + typedef int UserBookmarkList[3]; + +diff --git a/latexeditorview.h b/latexeditorview.h +index 5951656..796eb28 100644 +--- a/latexeditorview.h ++++ b/latexeditorview.h +@@ -22,7 +22,7 @@ + #include "gotolinewidget.h" + #include "replacewidget.h" + #include "minisplitter.h" +-#include "hunspell/hunspell.hxx" ++#include + + class LatexEditorView : public QWidget { + Q_OBJECT +diff --git a/latexhighlighter.h b/latexhighlighter.h +index e0b91b1..74ec42a 100644 +--- a/latexhighlighter.h ++++ b/latexhighlighter.h +@@ -20,7 +20,7 @@ + #include + #include + //#include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + class QTextDocument; + class LatexEditor; +diff --git a/spellerdialog.h b/spellerdialog.h +index 83248ae..cd16dad 100644 +--- a/spellerdialog.h ++++ b/spellerdialog.h +@@ -13,7 +13,7 @@ + + #include "ui_spellerdialog.h" + #include "latexeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + + #include + +diff --git a/texmaker.h b/texmaker.h +index 3b7135e..5713b5a 100644 +--- a/texmaker.h ++++ b/texmaker.h +@@ -48,7 +48,7 @@ + #include "usertagslistwidget.h" + #include "xmltagslistwidget.h" + #include "logeditor.h" +-#include "hunspell/hunspell.hxx" ++#include + #include "browser.h" + #include "pdfviewerwidget.h" + #include "pdfviewer.h" +diff --git a/texmaker.pro b/texmaker.pro +index 9b9083a..9feef01 100644 +--- a/texmaker.pro ++++ b/texmaker.pro +@@ -68,25 +68,6 @@ HEADERS += texmaker.h \ + synctex_parser_utils.h \ + usertagslistwidget.h \ + addtagdialog.h \ +- hunspell/affentry.hxx \ +- hunspell/affixmgr.hxx \ +- hunspell/atypes.hxx \ +- hunspell/baseaffix.hxx \ +- hunspell/csutil.hxx \ +- hunspell/dictmgr.hxx \ +- hunspell/hashmgr.hxx \ +- hunspell/htypes.hxx \ +- hunspell/hunspell.hxx \ +- hunspell/hunspell.h \ +- hunspell/langnum.hxx \ +- hunspell/license.hunspell \ +- hunspell/phonet.hxx \ +- hunspell/suggestmgr.hxx \ +- hunspell/license.myspell \ +- hunspell/filemgr.hxx \ +- hunspell/hunzip.hxx \ +- hunspell/replist.hxx \ +- hunspell/w_char.hxx \ + singleapp/qtlocalpeer.h \ + singleapp/qtlockedfile.h \ + singleapp/qtsingleapplication.h \ +@@ -173,18 +154,6 @@ SOURCES += main.cpp \ + synctex_parser_utils.c \ + usertagslistwidget.cpp \ + addtagdialog.cpp \ +- hunspell/affentry.cxx \ +- hunspell/affixmgr.cxx \ +- hunspell/csutil.cxx \ +- hunspell/dictmgr.cxx \ +- hunspell/hashmgr.cxx \ +- hunspell/hunspell.cxx \ +- hunspell/phonet.cxx \ +- hunspell/suggestmgr.cxx \ +- hunspell/utf_info.cxx \ +- hunspell/filemgr.cxx \ +- hunspell/replist.cxx \ +- hunspell/hunzip.cxx \ + singleapp/qtlocalpeer.cpp \ + singleapp/qtlockedfile.cpp \ + singleapp/qtsingleapplication.cpp \ +@@ -280,13 +249,11 @@ isEmpty( ICONDIR ) { + ICONDIR=/usr/share/pixmaps + } + +-INCLUDEPATH += /usr/include/poppler/qt4 +-LIBS += -L/usr/lib -lpoppler-qt4 +-LIBS += -L/usr/lib -lz ++LIBS += -lz + DEFINES += PREFIX=\\\"$${PREFIX}\\\" + target.path = $${PREFIX}/bin + +-#DEFINES += DEBIAN_SPELLDIR ++DEFINES += DEBIAN_SPELLDIR + + + INSTALLS = target +@@ -717,3 +684,6 @@ INSTALLS += utilities + ICON = texmaker.icns + QMAKE_INFO_PLIST =Info.plist + } ++ ++CONFIG += link_pkgconfig ++PKGCONFIG = hunspell poppler-qt4 +\ No newline at end of file diff --git a/app-office/texmaker/texmaker-3.5.2.ebuild b/app-office/texmaker/texmaker-3.5.2.ebuild new file mode 100644 index 000000000000..59cd152c05c8 --- /dev/null +++ b/app-office/texmaker/texmaker-3.5.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.5.2.ebuild,v 1.1 2012/11/07 15:45:47 jlec Exp $ + +EAPI=4 + +inherit base qt4-r2 versionator + +# The upstream version numbering is bad, so we have to remove a dot in the +# minor version number +MAJOR="$(get_major_version)" +MINOR_1="$(($(get_version_component_range 2)/10))" +MINOR_2="$(($(get_version_component_range 2)%10))" +if [ ${MINOR_2} -eq "0" ] ; then + MY_P="${PN}-${MAJOR}.${MINOR_1}" +else + MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}" +fi + +MY_P="${P}" + +DESCRIPTION="A nice LaTeX-IDE" +HOMEPAGE="http://www.xm1math.net/texmaker/" +SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +S="${WORKDIR}/${MY_P}" + +COMMON_DEPEND=" + app-text/poppler[qt4] + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXext + x11-libs/qt-gui:4 + x11-libs/qt-core:4 + x11-libs/qt-webkit:4 + app-text/hunspell" +RDEPEND="${COMMON_DEPEND} + virtual/latex-base + app-text/psutils + app-text/ghostscript-gpl + media-libs/netpbm" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-hunspell.patch + "${FILESDIR}"/${PN}-3.3.3-qt48.patch + ) +src_configure() { + eqmake4 \ + ${PN}.pro \ + PREFIX=/usr \ + DESKTOPDIR=/usr/share/applications \ + ICONDIR=/usr/share/pixmaps +} + +src_install() { + emake INSTALL_ROOT="${ED}" install + + doicon utilities/texmaker*.png utilities/texmaker.svg + + dodoc utilities/AUTHORS utilities/CHANGELOG.txt +} + +pkg_postinst() { + elog "A user manual with many screenshots is available at:" + elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html" +} diff --git a/app-office/texmakerx/Manifest b/app-office/texmakerx/Manifest deleted file mode 100644 index c36308b7279c..000000000000 --- a/app-office/texmakerx/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST texmakerx-2.1.tar.gz 11824680 SHA256 49e6bf7ffb5c2754861dbe9824255de4e6e5374e2f71e54e517cd57c3e31ba66 SHA512 b3b4b07eb676e76f6d8c96fad1375df17c265137f5af40bc16a56cc91a1e426ca0c06b1a3640fbde016eb0a1a8b3fb3d9648443e8e27b1aa1086d91163627f51 WHIRLPOOL ab2ab03766b2afc440e8b480d8a2f78443893ae2dbde12f224aebcc354ed0bd54934df06d4b199980cd4c2fa1c59d4f1067340c1f22d1b6909c727455edcd8c7 diff --git a/app-office/texmakerx/files/texmakerx-2.1-gcc-4.7.patch b/app-office/texmakerx/files/texmakerx-2.1-gcc-4.7.patch deleted file mode 100644 index 553435539379..000000000000 --- a/app-office/texmakerx/files/texmakerx-2.1-gcc-4.7.patch +++ /dev/null @@ -1,17 +0,0 @@ - qtsingleapplication/qtlocalpeer.cpp | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp -index 57ed567..4997626 100644 ---- a/qtsingleapplication/qtlocalpeer.cpp -+++ b/qtsingleapplication/qtlocalpeer.cpp -@@ -49,6 +49,9 @@ - #include - #include - -+#include -+#include -+ - #if defined(Q_OS_WIN) - #include - #include diff --git a/app-office/texmakerx/files/texmakerx-2.1-hunspell.patch b/app-office/texmakerx/files/texmakerx-2.1-hunspell.patch deleted file mode 100644 index 889402be50d4..000000000000 --- a/app-office/texmakerx/files/texmakerx-2.1-hunspell.patch +++ /dev/null @@ -1,70 +0,0 @@ - texmakerx.pro | 35 +++-------------------------------- - 1 files changed, 3 insertions(+), 32 deletions(-) - -diff --git a/texmakerx.pro b/texmakerx.pro -index 61530b7..85b3879 100644 ---- a/texmakerx.pro -+++ b/texmakerx.pro -@@ -6,7 +6,9 @@ CONFIG -= debug \ - debug_and_release \ - release - CONFIG += qt \ -- debug_and_release -+ debug_and_release \ -+ link_pkgconfig -+PKGCONFIG = hunspell - exists(texmakerx_my.pri):include(texmakerx_my.pri) - QT += network \ - xml \ -@@ -52,24 +54,6 @@ HEADERS += texmaker.h \ - codesnippet.h \ - thesaurusdialog.h \ - xmltagslistwidget.h \ -- hunspell/affentry.hxx \ -- hunspell/affixmgr.hxx \ -- hunspell/atypes.hxx \ -- hunspell/baseaffix.hxx \ -- hunspell/csutil.hxx \ -- hunspell/dictmgr.hxx \ -- hunspell/hashmgr.hxx \ -- hunspell/htypes.hxx \ -- hunspell/hunspell.hxx \ -- hunspell/hunspell.h \ -- hunspell/langnum.hxx \ -- hunspell/license.hunspell \ -- hunspell/phonet.hxx \ -- hunspell/suggestmgr.hxx \ -- hunspell/license.myspell \ -- hunspell/filemgr.hxx \ -- hunspell/hunzip.hxx \ -- hunspell/w_char.hxx \ - qcodeedit/lib/qeditorinputbinding.h \ - qcodeedit/lib/qeditorinputbindinginterface.h \ - randomtextgenerator.h \ -@@ -85,7 +69,6 @@ HEADERS += texmaker.h \ - latexdocument.h \ - unicodeinsertion.h \ - universalinputdialog.h \ -- hunspell/replist.hxx \ - scriptengine.h \ - insertgraphics.h \ - tmxtabwidget.h \ -@@ -135,18 +118,6 @@ SOURCES += main.cpp \ - codesnippet.cpp \ - thesaurusdialog.cpp \ - xmltagslistwidget.cpp \ -- hunspell/affentry.cxx \ -- hunspell/affixmgr.cxx \ -- hunspell/csutil.cxx \ -- hunspell/dictmgr.cxx \ -- hunspell/hashmgr.cxx \ -- hunspell/hunspell.cxx \ -- hunspell/phonet.cxx \ -- hunspell/replist.cxx \ -- hunspell/suggestmgr.cxx \ -- hunspell/utf_info.cxx \ -- hunspell/filemgr.cxx \ -- hunspell/hunzip.cxx \ - encodingdialog.cpp \ - qcodeedit/lib/qeditorinputbinding.cpp \ - randomtextgenerator.cpp \ diff --git a/app-office/texmakerx/metadata.xml b/app-office/texmakerx/metadata.xml deleted file mode 100644 index c845479d513e..000000000000 --- a/app-office/texmakerx/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - jlec@gentoo.org - - diff --git a/app-office/texmakerx/texmakerx-2.1.ebuild b/app-office/texmakerx/texmakerx-2.1.ebuild deleted file mode 100644 index e95e5fdbe97e..000000000000 --- a/app-office/texmakerx/texmakerx-2.1.ebuild +++ /dev/null @@ -1,47 +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/texmakerx/texmakerx-2.1.ebuild,v 1.4 2012/07/12 05:37:56 jlec Exp $ - -EAPI=4 - -inherit base qt4-r2 - -DESCRIPTION="Fork of the LaTeX IDE TexMaker" -HOMEPAGE="http://texmakerx.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/TexMakerX%202.1/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="" - -COMMON_DEPEND=" - app-text/hunspell - app-text/poppler[qt4] - x11-libs/libX11 - x11-libs/libXext - >=x11-libs/qt-gui-4.6.1:4 - >=x11-libs/qt-core-4.6.1:4 - >=x11-libs/qt-script-4.6.1:4 - >=x11-libs/qt-test-4.6.1:4 - >=x11-libs/qt-webkit-4.6.1:4" -RDEPEND="${COMMON_DEPEND} - virtual/latex-base - app-text/psutils - app-text/ghostscript-gpl - media-libs/netpbm" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -S="${WORKDIR}"/${P/-/} - -PATCHES=( - "${FILESDIR}/${P}-hunspell.patch" - "${FILESDIR}/${P}-gcc-4.7.patch" - ) - -src_prepare() { - find hunspell -delete - sed 's:hunspell/hunspell:hunspell:g' -i *.h || die - qt4-r2_src_prepare -} diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild index 508d9131b2db..143585ee698f 100644 --- a/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild,v 1.1 2012/11/05 23:59:49 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild,v 1.2 2012/11/07 15:30:41 fuzzyray Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -8,7 +8,7 @@ RESTRICT_PYTHON_ABIS="2.[45]" PYTHON_USE_WITH="xml" PYTHON_NONVERSIONED_EXECUTABLES=(".*") -inherit distutils python eutils +inherit distutils python DESCRIPTION="Collection of administration scripts for Gentoo" HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml" diff --git a/dev-lang/v8/Manifest b/dev-lang/v8/Manifest index 5865bf9b56ed..7a2ddf57d478 100644 --- a/dev-lang/v8/Manifest +++ b/dev-lang/v8/Manifest @@ -1,5 +1,3 @@ -DIST v8-3.12.19.15.tar.bz2 10184474 SHA256 5f8f0a700a88250170118b5994aacf57f6527a6c0017096b5cb322ecbad6e187 SHA512 40c1bbc4dc48331c5f6cfeb4a0168abd47b8c11d68be64bef25a094439898f197920f3bb5b7be2c795a9906a5789239f843702ae6f65439bb6b1f958fb40297d WHIRLPOOL 65e145a8b866213790e03d97293d7911754169f33c497007f5f1806e9ab32f1fe9a257a3966a8814972c8b0d08361f81548ec01c0fbd3f6dcc742bbf13f1c868 -DIST v8-3.13.7.4.tar.bz2 10203184 SHA256 8faa9c1e797f0499378ed03f3d809dcd4bc64a7d1dd6b2b303e1a3039357b888 SHA512 e324a2e52740c9d155c81d2a1b54778f1f03451b2c5b0aeb0894791845252e4182bee0dc94cb56019d70aa424214cecba86a0f91ab8db426e321728050f504bd WHIRLPOOL 4755754012e33b2d21260aa409f900bc9f9fa3c4ce31aff1a1228d28297f707e178c0cd2121449e6dcf9cc6dc3d44f8a56f90b714a8f210a3fd3a40ff14a33e8 DIST v8-3.13.7.5.tar.bz2 10203429 SHA256 f28c939b89adfbb8a7e44b1c65a75c368256e68d17ee84516b2bb15e946e6d5f SHA512 71bf56b913a96850d97e27615c4a0ccec384bb5eb4774f0af6fd9029b6762f71b6119b92d6dad6ef4c001954623213ef3a46e168a7fd7f334981e4c6c00a0a57 WHIRLPOOL 4400312a142e509ce25fbebd02313377c120c8f0d8852ee6a5e788f7338a5e47f2c41b2b52921ae2ae51987ea87418a149f241a60bc11b32cac3d820f5cccfe3 DIST v8-3.14.4.1.tar.bz2 10347734 SHA256 06ccd996d8e82580aa6a9ea41bbd2a5c66fa599b666df3b4b2b3deca453831b1 SHA512 c6b13365529c3440b717cc4cbd0563e1a0246bc694eaf9aa11bbe18f4526aa373af36252310fc8f2e83620adb7a81b1214da71d5d31a328b5accd32144992e76 WHIRLPOOL 218dc59348327dbd0750aa6422114abf6ffb4a85050fe72c83745e16d8cbbfa7a5b4c0afeab4ab4dca6d36a35beae36079f4d566ac0181c69ba5ab719b4a80d9 DIST v8-3.14.5.tar.bz2 10351058 SHA256 361ad3b63dc7c9d0943b72b1be592a8135e4ddb0e416b9bcf02b4d2df514fca7 SHA512 ee27a9f892c1d2151173d38e007dc226c0d59768c26bb2e8f9be8057898d76839c93f70fcda4e6771634d564dcb565e1378e6fcbbfcd8317723cb63c24d32956 WHIRLPOOL 9a9ea3bdf7b466329640ecad752b04ef3c7e288581a23683cda331323369ee2804e91419b2a20eba19594eb517850b33761e13dc7b02f96d1771bca306c7e391 diff --git a/dev-lang/v8/v8-3.12.19.15.ebuild b/dev-lang/v8/v8-3.12.19.15.ebuild deleted file mode 100644 index 91f64d388682..000000000000 --- a/dev-lang/v8/v8-3.12.19.15.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.15.ebuild,v 1.3 2012/10/09 18:39:44 ago Exp $ - -EAPI="4" - -PYTHON_DEPEND="2:2.6" - -inherit eutils multilib pax-utils python toolchain-funcs versionator - -DESCRIPTION="Google's open source JavaScript engine" -HOMEPAGE="http://code.google.com/p/v8" -SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2" -LICENSE="BSD" - -SLOT="0" -KEYWORDS="amd64 x86 ~x86-fbsd ~x64-macos ~x86-macos" -IUSE="" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.10.8.10-freebsd9.patch -} - -src_compile() { - tc-export AR CC CXX RANLIB - export LINK=${CXX} - - # Use target arch detection logic from bug #354601. - case ${CHOST} in - i?86-*) myarch=ia32 ;; - x86_64-*) - if [[ $ABI = x86 ]] ; then - myarch=ia32 - else - myarch=x64 - fi ;; - arm*-*) myarch=arm ;; - *) die "Unrecognized CHOST: ${CHOST}" - esac - mytarget=${myarch}.release - - soname_version="$(get_version_component_range 1-3)" - - local snapshot=on - host-is-pax && snapshot=off - - # TODO: Add console=readline option once implemented upstream - # http://code.google.com/p/v8/issues/detail?id=1781 - - emake V=1 \ - library=shared \ - werror=no \ - soname_version=${soname_version} \ - snapshot=${snapshot} \ - ${mytarget} || die - - pax-mark m out/${mytarget}/{cctest,d8,shell} || die -} - -src_test() { - local arg testjobs - for arg in ${MAKEOPTS}; do - case ${arg} in - -j*) testjobs=${arg#-j} ;; - --jobs=*) testjobs=${arg#--jobs=} ;; - esac - done - - tools/test-wrapper-gypbuild.py \ - -j${testjobs:-1} \ - --arch-and-mode=${mytarget} \ - --no-presubmit \ - --progress=dots || die -} - -src_install() { - insinto /usr - doins -r include || die - - if [[ ${CHOST} == *-darwin* ]] ; then - # buildsystem is too horrific to get this built correctly - mkdir -p out/${mytarget}/lib.target - mv out/${mytarget}/libv8.so.${soname_version} \ - out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die - install_name_tool \ - -id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \ - out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) \ - || die - install_name_tool \ - -change \ - "${S}"/out/${mytarget}/libv8.so.${soname_version} \ - "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \ - out/${mytarget}/d8 || die - fi - - dobin out/${mytarget}/d8 || die - - dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die - dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die - - dodoc AUTHORS ChangeLog || die -} - -pkg_preinst() { - preserved_libs=() - local baselib candidate - - eshopts_push -s nullglob - - for candidate in "${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do - baselib=${candidate##*/} - if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then - preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" ) - fi - done - - eshopts_pop - - if [[ ${#preserved_libs[@]} -gt 0 ]]; then - preserve_old_lib "${preserved_libs[@]}" - fi -} - -pkg_postinst() { - if [[ ${#preserved_libs[@]} -gt 0 ]]; then - preserve_old_lib_notify "${preserved_libs[@]}" - fi -} diff --git a/dev-lang/v8/v8-3.13.7.4.ebuild b/dev-lang/v8/v8-3.13.7.4.ebuild deleted file mode 100644 index 4f4e1ae1e2d7..000000000000 --- a/dev-lang/v8/v8-3.13.7.4.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.13.7.4.ebuild,v 1.1 2012/10/17 22:22:56 floppym Exp $ - -EAPI="4" - -PYTHON_DEPEND="2:2.6" - -inherit eutils multilib pax-utils python toolchain-funcs versionator - -DESCRIPTION="Google's open source JavaScript engine" -HOMEPAGE="http://code.google.com/p/v8" -SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2" -LICENSE="BSD" - -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos" -IUSE="" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.10.8.10-freebsd9.patch -} - -src_compile() { - tc-export AR CC CXX RANLIB - export LINK=${CXX} - - local hardfp=off - - # Use target arch detection logic from bug #354601. - case ${CHOST} in - i?86-*) myarch=ia32 ;; - x86_64-*) - if [[ $ABI = x86 ]] ; then - myarch=ia32 - else - myarch=x64 - fi ;; - arm*-hardfloat-*) - hardfp=on - myarch=arm ;; - arm*-*) myarch=arm ;; - *) die "Unrecognized CHOST: ${CHOST}" - esac - mytarget=${myarch}.release - - soname_version="$(get_version_component_range 1-3)" - - local snapshot=on - host-is-pax && snapshot=off - - # TODO: Add console=readline option once implemented upstream - # http://code.google.com/p/v8/issues/detail?id=1781 - - emake V=1 \ - library=shared \ - werror=no \ - soname_version=${soname_version} \ - snapshot=${snapshot} \ - hardfp=${hardfp} \ - ${mytarget} || die - - pax-mark m out/${mytarget}/{cctest,d8,shell} || die -} - -src_test() { - local arg testjobs - for arg in ${MAKEOPTS}; do - case ${arg} in - -j*) testjobs=${arg#-j} ;; - --jobs=*) testjobs=${arg#--jobs=} ;; - esac - done - - tools/test-wrapper-gypbuild.py \ - -j${testjobs:-1} \ - --arch-and-mode=${mytarget} \ - --no-presubmit \ - --progress=dots || die -} - -src_install() { - insinto /usr - doins -r include || die - - if [[ ${CHOST} == *-darwin* ]] ; then - # buildsystem is too horrific to get this built correctly - mkdir -p out/${mytarget}/lib.target - mv out/${mytarget}/libv8.so.${soname_version} \ - out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die - install_name_tool \ - -id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \ - out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) \ - || die - install_name_tool \ - -change \ - "${S}"/out/${mytarget}/libv8.so.${soname_version} \ - "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \ - out/${mytarget}/d8 || die - fi - - dobin out/${mytarget}/d8 || die - - dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die - dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die - - dodoc AUTHORS ChangeLog || die -} - -pkg_preinst() { - preserved_libs=() - local baselib candidate - - eshopts_push -s nullglob - - for candidate in "${EROOT}usr/$(get_libdir)"/libv8$(get_libname).*; do - baselib=${candidate##*/} - if [[ ! -e "${ED}usr/$(get_libdir)/${baselib}" ]]; then - preserved_libs+=( "${EPREFIX}/usr/$(get_libdir)/${baselib}" ) - fi - done - - eshopts_pop - - if [[ ${#preserved_libs[@]} -gt 0 ]]; then - preserve_old_lib "${preserved_libs[@]}" - fi -} - -pkg_postinst() { - if [[ ${#preserved_libs[@]} -gt 0 ]]; then - preserve_old_lib_notify "${preserved_libs[@]}" - fi -} diff --git a/dev-lang/v8/v8-3.13.7.5.ebuild b/dev-lang/v8/v8-3.13.7.5.ebuild index a7d9d4bb962a..72b84a7e1f4c 100644 --- a/dev-lang/v8/v8-3.13.7.5.ebuild +++ b/dev-lang/v8/v8-3.13.7.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.13.7.5.ebuild,v 1.1 2012/10/31 20:12:14 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.13.7.5.ebuild,v 1.3 2012/11/07 16:20:37 ago Exp $ EAPI="4" @@ -14,7 +14,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}. LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~arm x86 ~x86-fbsd ~x64-macos ~x86-macos" IUSE="" pkg_setup() { diff --git a/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch b/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch new file mode 100644 index 000000000000..fabbe4cda512 --- /dev/null +++ b/dev-python/guppy/files/guppy-0.1.9-rm_BrokenTests.patch @@ -0,0 +1,57 @@ +diff -ur guppy-0.1.9.orig/guppy/sets/test.py guppy-0.1.9/guppy/sets/test.py +--- guppy/sets/test.py 2009-06-23 21:48:32.000000000 +0800 ++++ guppy/sets/test.py 2012-11-07 16:59:38.383392670 +0800 +@@ -4,6 +4,11 @@ + # so wouldn't check so much with python -O. + + import gc, random, sys ++if sys.version_info[:2] == (2, 7): ++ import unittest ++else: ++ import unittest2 as unittest ++ + try: + import numpy.random + except ImportError: +@@ -211,6 +211,7 @@ + + '.nython off' + ++@unittest.skip("Class broken") + class Test: + faster = 1 # Set to 1 if test should be faster (less exhaustive) than normally + +diff -ur guppy-0.1.9.orig/guppy/heapy/test/test_View.py guppy-0.1.9/guppy/heapy/test/test_View.py +--- guppy/heapy/test/test_View.py 2009-06-12 18:20:53.000000000 +0800 ++++ guppy/heapy/test/test_View.py 2012-11-07 17:23:52.289280501 +0800 +@@ -1,4 +1,11 @@ + from guppy.heapy.test import support ++import sys ++ ++if sys.version_info[:2] == (2, 7): ++ import unittest ++else: ++ import unittest2 as unittest ++ + class TestCase(support.TestCase): + def setUp(self): + support.TestCase.setUp(self) +@@ -55,6 +55,7 @@ + p = iso(z).referents.indisize + self.aseq(p, iso(y).indisize) + ++ @unittest.skip("broken test") + def test_horizon(self): + iso = self.iso + h = self.View.horizon() +diff -ur guppy-0.1.9.orig/guppy/heapy/test/test_all.py guppy-0.1.9/guppy/heapy/test/test_all.py +--- guppy/heapy/test/test_all.py 2009-06-18 21:44:11.000000000 +0800 ++++ guppy/heapy/test/test_all.py 2012-11-07 17:34:04.036233306 +0800 +@@ -1,7 +1,6 @@ + import sys + + autotests = ( +- 'dependencies', + 'Classifiers', + 'heapyc', + 'ER', diff --git a/dev-python/guppy/guppy-0.1.9-r2.ebuild b/dev-python/guppy/guppy-0.1.9-r2.ebuild index f90e28b5572b..8d0c05d54e22 100644 --- a/dev-python/guppy/guppy-0.1.9-r2.ebuild +++ b/dev-python/guppy/guppy-0.1.9-r2.ebuild @@ -1,14 +1,15 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/guppy/guppy-0.1.9-r2.ebuild,v 1.2 2012/02/20 15:18:59 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/guppy/guppy-0.1.9-r2.ebuild,v 1.3 2012/11/07 12:23:30 idella4 Exp $ EAPI="3" PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" +PYTHON_TESTS_RESTRICTED_ABIS="2.[56]" DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1" -inherit distutils +inherit distutils eutils DESCRIPTION="Guppy-PE -- A Python Programming Environment" HOMEPAGE="http://guppy-pe.sourceforge.net/ http://pypi.python.org/pypi/guppy" @@ -27,6 +28,7 @@ PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") DOCS="ANNOUNCE ChangeLog" src_prepare() { + epatch "${FILESDIR}"/${P}-rm_BrokenTests.patch distutils_src_prepare preparation() { if [[ ${PYTHON_ABI} == "2.7" ]]; then diff --git a/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch b/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch new file mode 100644 index 000000000000..057d70747e74 --- /dev/null +++ b/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch @@ -0,0 +1,23 @@ +diff -ur wehjit-0.2.2.orig/wehjit/collection.py wehjit-0.2.2/wehjit/collection.py +--- wehjit/collection.py 2010-02-11 16:26:14.000000000 +0800 ++++ wehjit/collection.py 2012-11-08 14:24:40.326482713 +0800 +@@ -22,6 +22,11 @@ + Collect widget plugins together in a `Collection`. + """ + ++import sys ++if sys.version_info[:2] == (2, 7): ++ import unittest ++else: ++ import unittest2 as unittest + import inspect + import os + from os import path +@@ -130,6 +135,7 @@ + """ + return name in self.__plugins + ++ @unittest.skip("Plugin not in gentoo") + def __getitem__(self, name): + """ + Return the plugin named ``name``. diff --git a/dev-python/wehjit/wehjit-0.2.2.ebuild b/dev-python/wehjit/wehjit-0.2.2.ebuild index 09f424048405..83677d09feb7 100644 --- a/dev-python/wehjit/wehjit-0.2.2.ebuild +++ b/dev-python/wehjit/wehjit-0.2.2.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wehjit/wehjit-0.2.2.ebuild,v 1.2 2012/02/23 04:31:57 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wehjit/wehjit-0.2.2.ebuild,v 1.3 2012/11/07 16:25:18 idella4 Exp $ EAPI=3 SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.* *-jython" -DISTUTILS_SRC_TEST="nosetests" - -inherit distutils +#DISTUTILS_SRC_TEST="nosetests" # for now can't be used in src_test +PYTHON_TESTS_RESTRICTED_ABIS="2.5" +inherit distutils eutils DESCRIPTION="A Python web-widget library" HOMEPAGE="http://jderose.fedorapeople.org/wehjit" @@ -29,3 +29,19 @@ DEPEND="${RDEPEND}" DOCS="README TODO NEWS AUTHORS" python_enable_pyc + +src_prepare() { + + epatch "${FILESDIR}"/${P}-SkipTest.patch +} + +src_test() { + testing() { + if [[ "${PYTHON_ABI:2:1}" == '6' ]]; then + nosetests -I test_app* -e=*getitem + else + nosetests + fi + } + python_execute_function testing +} diff --git a/dev-scheme/elk/Manifest b/dev-scheme/elk/Manifest index 90817d25cab2..f357ae43df86 100644 --- a/dev-scheme/elk/Manifest +++ b/dev-scheme/elk/Manifest @@ -1 +1,2 @@ -DIST elk-3.99.7.tar.bz2 646698 RMD160 659cad65897f75a956aca8fab5f7806624691a5f SHA1 e42391fc4aa96ba300b3db736e96cfd68449095b SHA256 a72b66b219313af23f5923a476c8b332e0124c953fd172bb62d5f9554d3cbc4c +DIST elk-3.99.7.tar.bz2 646698 SHA256 a72b66b219313af23f5923a476c8b332e0124c953fd172bb62d5f9554d3cbc4c +DIST elk-3.99.8.tar.bz2 701206 SHA256 a148320c8d2c2b1277ad3572a9d8a9eb4db0473643caa35f098e28c9da14dc66 SHA512 dd966bf6063b4e04c0947e56381cc9456ea81cf4ec66d04e80cb79485d39414f0b713520278a62fa4630068f245f33b28b08b5fd4a7defd0bcb20bf2eba4ed49 WHIRLPOOL 3b8f6a26277ebe5c2e4ad2420b7e842b125bde1406120e89db5a25c770e70dd015a300289432e15e541d588fef451233c72ce7236a93cdf653430933c09a18bc diff --git a/dev-scheme/elk/elk-3.99.8.ebuild b/dev-scheme/elk/elk-3.99.8.ebuild new file mode 100644 index 000000000000..7793b266a7e0 --- /dev/null +++ b/dev-scheme/elk/elk-3.99.8.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/elk/elk-3.99.8.ebuild,v 1.1 2012/11/07 14:05:32 hkbst Exp $ + +EAPI="4" + +DESCRIPTION="Scheme implementation designed to be embeddable extension to C/C++ applications" +HOMEPAGE="http://sam.zoy.org/elk" +SRC_URI="http://sam.zoy.org/elk/${P}.tar.bz2" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="" + +src_compile() { + # parallel build is broken + emake -j1 || die "Make failed!" +} + +# tests are run automatically during make and fail with default src_test +src_test() { + echo "Tests already run during compile" +} + +src_install() { + # parallel install is broken + emake -j1 DESTDIR="${D}" install || die "Install failed" +} diff --git a/dev-util/cpptest/cpptest-1.1.2.ebuild b/dev-util/cpptest/cpptest-1.1.2.ebuild index 2885aa2e8ddc..91864ad05298 100644 --- a/dev-util/cpptest/cpptest-1.1.2.ebuild +++ b/dev-util/cpptest/cpptest-1.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cpptest/cpptest-1.1.2.ebuild,v 1.3 2012/11/06 17:10:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cpptest/cpptest-1.1.2.ebuild,v 1.4 2012/11/07 12:05:19 blueness Exp $ EAPI=4 inherit eutils @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ppc ppc64 ~sparc ~x86" IUSE="doc" DEPEND="doc? ( app-doc/doxygen )" @@ -28,4 +28,4 @@ src_configure() { src_install() { default prune_libtool_files -} \ No newline at end of file +} diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild index 210fe261e5bf..eba7194fe268 100644 --- a/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild +++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild,v 1.1 2012/10/02 05:50:24 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/networkmanagement/networkmanagement-0.9.0.5.ebuild,v 1.3 2012/11/07 12:41:49 ago Exp $ EAPI=4 @@ -14,7 +14,7 @@ HOMEPAGE="http://www.kde.org/" [[ ${PV} = 9999* ]] || SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" SLOT="4" IUSE="debug" diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest index 927956084177..1805b76c31e1 100644 --- a/mail-filter/amavisd-new/Manifest +++ b/mail-filter/amavisd-new/Manifest @@ -1 +1,2 @@ DIST amavisd-new-2.7.2.tar.gz 945448 SHA256 4665e0fb9a71f483f1123113a006291e37f744a5880f945ccf9fd34d51cb9275 SHA512 f707a5ac9d6acee2f9d144fda86fed92bbf33693858262ab0a95663da50f78a023102d9d50dd5a6a256ef6302a241f9c28d2b190e3efe2110c0eea15557ae756 WHIRLPOOL c0422d80b9dc11a7a2e9cb10092b7c97c02536aa852f70c566ab6e2e6a865b901ad24caf626b8b02ee64979bced7c25f03888827fd47ffbc4e733bb733e08c9e +DIST amavisd-new-2.8.0.tar.xz 716556 SHA256 c21df73b4ba12322b67779fa5f6f23f57757240568f57d81e94702f0f7c1ce8c SHA512 4c927a6956027d8c953b455d37c0c152950ad392c50de992ecbd1f3525d13c11bc29b845496a2a51713fafbf62b6d589435d385b3bccaa34829049890cf56635 WHIRLPOOL c82d58a4d4337b3b42dcdd2e8b80060bdf288db51bdb5e69a8a1351733b4661d79a52d257f18cd26cf9a334f1195db0d8d9a0e3bf28a1043a49e5946817fba62 diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild new file mode 100644 index 000000000000..d0d91d60160e --- /dev/null +++ b/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.8.0.ebuild,v 1.1 2012/11/07 12:55:15 eras Exp $ + +EAPI=4 +inherit eutils user + +MY_P="${P/_/-}" +DESCRIPTION="High-performance interface between the MTA and content checkers." +HOMEPAGE="http://www.ijs.si/software/amavisd/" +SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq" + +DEPEND=">=sys-apps/sed-4 + >=dev-lang/perl-5.8.2" + +RDEPEND="${DEPEND} + >=sys-apps/coreutils-5.0-r3 + app-arch/cpio + app-arch/gzip + app-arch/bzip2 + app-arch/arc + app-arch/cabextract + app-arch/freeze + app-arch/lha + app-arch/lrzip + app-arch/lzop + app-arch/ncompress + app-arch/p7zip + app-arch/pax + app-arch/unarj + app-arch/unrar + app-arch/xz-utils + app-arch/zoo + net-mail/ripole + >=dev-perl/Archive-Zip-1.14 + >=virtual/perl-IO-Compress-1.35 + >=virtual/perl-Compress-Raw-Zlib-2.017 + dev-perl/Convert-TNEF + >=dev-perl/Convert-UUlib-1.08 + virtual/perl-MIME-Base64 + >=dev-perl/MIME-tools-5.415 + >=dev-perl/MailTools-1.58 + >=dev-perl/net-server-0.91 + virtual/perl-Digest-MD5 + dev-perl/IO-stringy + dev-perl/IO-Socket-IP + >=virtual/perl-Time-HiRes-1.49 + dev-perl/Unix-Syslog + sys-apps/file + >=sys-libs/db-4.4.20 + dev-perl/BerkeleyDB + dev-perl/Convert-BinHex + >=dev-perl/Mail-DKIM-0.31 + virtual/mta + ldap? ( >=dev-perl/perl-ldap-0.33 ) + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg ) + razor? ( mail-filter/razor ) + snmp? ( net-analyzer/net-snmp[perl] ) + spamassassin? ( mail-filter/spamassassin ) + zmq? ( dev-perl/ZMQ-LibZMQ2 )" + +AMAVIS_ROOT="/var/amavis" +S="${WORKDIR}/${MY_P}" + +src_prepare() { + if use courier ; then + epatch amavisd-new-courier.patch + fi + + if use qmail ; then + epatch amavisd-new-qmqpqq.patch + fi + + sed -i \ + -e '/daemon/s/vscan/amavis/' \ + -e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \ + "${S}/amavisd.conf" "${S}/amavis-mc" || die + + if ! use dkim ; then + sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \ + || die "missing conf file" + fi + + if use zmq ; then + sed -i -e '/enable_zmq/s/# //' "${S}/amavisd.conf" + fi +} + +src_install() { + dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \ + amavisd-signer amavisd-status + dobin p0f-analyzer.pl amavisd-submit + + if use snmp ; then + dosbin amavisd-snmp-subagent + use zmq && dosbin amavisd-snmp-subagent-zmq + dodoc AMAVIS-MIB.txt + fi + + if use zmq ; then + dosbin amavis-services amavis-mc + newinitd "${FILESDIR}"/amavis-mc.initd amavis-mc + fi + + insinto /etc + insopts -m0640 + doins amavisd.conf + + newinitd "${FILESDIR}/amavisd.initd-r1" amavisd + + keepdir "${AMAVIS_ROOT}" + keepdir "${AMAVIS_ROOT}/db" + keepdir "${AMAVIS_ROOT}/quarantine" + keepdir "${AMAVIS_ROOT}/tmp" + keepdir "${AMAVIS_ROOT}/var" + + dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \ + amavisd.conf-default amavisd-custom.conf + + docinto README_FILES + dodoc README_FILES/README* + dohtml README_FILES/*.{html,css} + docinto README_FILES/images + dodoc README_FILES/images/*.png + docinto README_FILES/images/callouts + dodoc README_FILES/images/callouts/*.png + + docinto test-messages + dodoc test-messages/README + dodoc test-messages/sample.tar.gz.compl + + #for i in whitelist blacklist spam_lovers; do + # if [ -f ${AMAVIS_ROOT}/${i} ]; then + # cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}" + # else + # touch "${D}"/${AMAVIS_ROOT}/${i} + # fi + #done + + if use ldap ; then + dodir /etc/openldap/schema + insinto /etc/openldap/schema + insopts -o root -g root -m 644 + newins LDAP.schema ${PN}.schema || die + fi +} + +pkg_preinst() { + enewgroup amavis + enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis + if use razor ; then + if [ ! -d "${ROOT}${AMAVIS_ROOT}/.razor" ] ; then + elog "Setting up initial razor config files..." + + razor-admin -create -home="${D}/${AMAVIS_ROOT}/.razor" + sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \ + "${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf" + fi + fi + + if ! use spamassassin ; then + elog "Disabling anti-spam code in amavisd.conf..." + sed -i -e \ + "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \ + "${D}/etc/amavisd.conf" + fi + + if has_version "<${CATEGORY}/${PN}-2.7.0" ; then + elog "Amavisd-new ships with a short and condensed config file now." + elog "Transferring your current settings to the new format is" + elog "recommended for ease of future upgrades." + fi +} + +pkg_postinst() { + chown root:amavis "${ROOT}/etc/amavisd.conf" + chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}" +} diff --git a/mail-filter/amavisd-new/files/amavis-mc.initd b/mail-filter/amavisd-new/files/amavis-mc.initd new file mode 100644 index 000000000000..f859dbaaf818 --- /dev/null +++ b/mail-filter/amavisd-new/files/amavis-mc.initd @@ -0,0 +1,24 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavis-mc.initd,v 1.1 2012/11/07 12:55:15 eras Exp $ + +prog="/usr/sbin/amavis-mc" +progname="amavis-mc" + +depend() { + use logger + before amavisd-new snmpd +} + +start() { + ebegin "Starting ${progname}" + start-stop-daemon --start --exec ${prog} + eend $? +} + +stop() { + ebegin "Stopping ${progname}" + start-stop-daemon --stop --interpreted --exec ${prog} + eend $? +} diff --git a/mail-filter/amavisd-new/files/amavisd.initd-r1 b/mail-filter/amavisd-new/files/amavisd.initd-r1 new file mode 100644 index 000000000000..c456ff446436 --- /dev/null +++ b/mail-filter/amavisd-new/files/amavisd.initd-r1 @@ -0,0 +1,45 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd-r1,v 1.1 2012/11/07 12:55:15 eras Exp $ + +extra_started_commands="reload" +extra_commands="debug debug_sa" + +prog="/usr/sbin/amavisd" +progname="amavisd-new" + +depend() { + use net logger antivirus snmpd + before mta +} + +start() { + ebegin "Starting ${progname}" + "${prog}" start + eend $? +} + +stop() { + ebegin "Stopping ${progname}" + "${prog}" stop 1>/dev/null + eend $? +} + +reload() { + ebegin "Reloading ${progname}" + "${prog}" reload 1>/dev/null + eend $? +} + +debug() { + ebegin "Starting ${progname} in debug mode" + "${prog}" debug + eend $? +} + +debug_sa() { + ebegin "Starting ${progname} in debug-sa mode" + "${prog}" debug-sa + eend $? +} diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml index 72688c123820..ad94427b2e9a 100644 --- a/mail-filter/amavisd-new/metadata.xml +++ b/mail-filter/amavisd-new/metadata.xml @@ -9,5 +9,6 @@ Add qmail support Add support for mail-filter/razor Add support for mail-filter/spamassassin + Add support for zeromq sockets diff --git a/media-libs/mediastreamer/Manifest b/media-libs/mediastreamer/Manifest index 1453370deeba..6ac11a86f48c 100644 --- a/media-libs/mediastreamer/Manifest +++ b/media-libs/mediastreamer/Manifest @@ -1 +1 @@ -DIST mediastreamer-2.7.3.tar.gz 758146 RMD160 ce37caec4b80012b3231929a9e337147ee730d1f SHA1 5d3c94b74131d2d333212de7315c39d230b91539 SHA256 c3cbea285f1e85259b2ac06d3f1730b4258e280011598b91f5b90b8432bf1dc0 +DIST mediastreamer-2.7.3.tar.gz 758146 SHA256 c3cbea285f1e85259b2ac06d3f1730b4258e280011598b91f5b90b8432bf1dc0 SHA512 f9ebfa12b1c760b5c24b5496466d92148a170ee2d522d9085db3fb72cc93f8e3e71ba1ae14f57d94a33b752450555c7d3ebf59267447203861247a8685e18259 WHIRLPOOL c1528bcca27c979ac29d6ccb6e32eac53ddd9e69d3f034056ad579d5ff6cd295c9224db6b841d6aa708e2c60251b192e85d6843342c14f8ead75d9f137c8d818 diff --git a/media-libs/mediastreamer/files/mediastreamer-2.7.3-ffmpeg-0.11.patch b/media-libs/mediastreamer/files/mediastreamer-2.7.3-ffmpeg-0.11.patch new file mode 100644 index 000000000000..c242b5fe139c --- /dev/null +++ b/media-libs/mediastreamer/files/mediastreamer-2.7.3-ffmpeg-0.11.patch @@ -0,0 +1,94 @@ +Fix build with recent ffmpeg releases. +https://bugs.gentoo.org/show_bug.cgi?id=419453 + +Index: mediastreamer-2.7.3/src/videoenc.c +=================================================================== +--- mediastreamer-2.7.3.orig/src/videoenc.c ++++ mediastreamer-2.7.3/src/videoenc.c +@@ -53,7 +53,6 @@ void ms_ffmpeg_log_callback(void* ptr, i + + void ms_ffmpeg_check_init(){ + if(!avcodec_initialized){ +- avcodec_init(); + avcodec_register_all(); + avcodec_initialized=TRUE; + #ifdef ENABLE_LOG_FFMPEG +@@ -107,6 +106,7 @@ typedef struct EncState{ + uint32_t framenum; + VideoStarter starter; + bool_t req_vfu; ++ AVDictionary * ff_opts; + }EncState; + + static int enc_set_fps(MSFilter *f, void *arg){ +@@ -214,6 +214,7 @@ static void enc_init(MSFilter *f, enum C + s->req_vfu=FALSE; + s->framenum=0; + s->av_context.codec=NULL; ++ s->ff_opts = NULL; + } + + static void enc_h263_init(MSFilter *f){ +@@ -300,9 +301,9 @@ static void prepare_h263(EncState *s){ + if (s->profile==0){ + s->codec=CODEC_ID_H263; + }else{ +- c->flags|=CODEC_FLAG_H263P_UMV; ++ av_dict_set(&(s->ff_opts), "umv", "1", 0); + c->flags|=CODEC_FLAG_AC_PRED; +- c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; ++ av_dict_set(&(s->ff_opts), "structured_slices", "1", 0); + /* + c->flags|=CODEC_FLAG_OBMC; + c->flags|=CODEC_FLAG_AC_PRED; +@@ -342,9 +343,9 @@ static void enc_preprocess(MSFilter *f){ + ms_error("could not find encoder for codec id %i",s->codec); + return; + } +- error=avcodec_open(&s->av_context, s->av_codec); ++ error=avcodec_open2(&s->av_context, s->av_codec, &(s->ff_opts)); + if (error!=0) { +- ms_error("avcodec_open() failed: %i",error); ++ ms_error("avcodec_open2() failed: %i",error); + return; + } + video_starter_init(&s->starter); +@@ -372,7 +373,7 @@ static void add_rfc2190_header(mblk_t ** + // assume video size is CIF or QCIF + if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60; + else header->b_wptr[1] = 0x40; +- if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10; ++ if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10; + header->b_wptr += 4; + header->b_cont = *packet; + *packet = header; +@@ -779,7 +780,7 @@ static void process_frame(MSFilter *f, m + s->req_vfu=TRUE; + } + if (s->req_vfu){ +- pict.pict_type=FF_I_TYPE; ++ pict.pict_type=AV_PICTURE_TYPE_I; + s->req_vfu=FALSE; + } + comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base; +@@ -799,7 +800,7 @@ static void process_frame(MSFilter *f, m + if (s->framenum==1){ + video_starter_first_frame (&s->starter,f->ticker->time); + } +- if (c->coded_frame->pict_type==FF_I_TYPE){ ++ if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){ + ms_message("Emitting I-frame"); + } + comp_buf->b_wptr+=error; +Index: mediastreamer-2.7.3/src/h264dec.c +=================================================================== +--- mediastreamer-2.7.3.orig/src/h264dec.c ++++ mediastreamer-2.7.3/src/h264dec.c +@@ -46,7 +46,6 @@ typedef struct _DecData{ + static void ffmpeg_init(){ + static bool_t done=FALSE; + if (!done){ +- avcodec_init(); + avcodec_register_all(); + done=TRUE; + } diff --git a/media-libs/mediastreamer/files/mediastreamer-2.7.3-videoenc_282.patch b/media-libs/mediastreamer/files/mediastreamer-2.7.3-videoenc_282.patch new file mode 100644 index 000000000000..66d055ede084 --- /dev/null +++ b/media-libs/mediastreamer/files/mediastreamer-2.7.3-videoenc_282.patch @@ -0,0 +1,130 @@ +Update videoenc.c to the 2.8.2 version. Fixes some but not all problems with +ffmpeg. + + +--- mediastreamer-2.7.3/src/videoenc.c 2010-12-17 05:59:50.000000000 -0300 ++++ mediastreamer-2.8.2/src/videoenc.c 2012-02-17 06:16:20.000000000 -0300 +@@ -164,6 +164,7 @@ + }else{ + ms_warning("unsupported video size %s",tmp); + ret=FALSE; ++ goto end; + } + divider=atoi(equal+1); + if (divider!=0){ +@@ -174,6 +175,8 @@ + ret=FALSE; + } + }else ret=FALSE; ++ ++end: + ms_free(tmp); + return ret; + } +@@ -231,11 +234,7 @@ + + static void prepare(EncState *s){ + AVCodecContext *c=&s->av_context; +-#ifdef ANDROID + const int max_br_vbv=128000; +-#else +- const int max_br_vbv=256000; +-#endif + + avcodec_get_context_defaults(c); + if (s->codec==CODEC_ID_MJPEG) +@@ -315,13 +314,6 @@ + static void prepare_mpeg4(EncState *s){ + AVCodecContext *c=&s->av_context; + c->max_b_frames=0; /*don't use b frames*/ +- c->flags|=CODEC_FLAG_AC_PRED; +- c->flags|=CODEC_FLAG_H263P_UMV; +- /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */ +- c->flags|=CODEC_FLAG_4MV; +- c->flags|=CODEC_FLAG_GMC; +- c->flags|=CODEC_FLAG_LOOP_FILTER; +- c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; + } + + static void enc_uninit(MSFilter *f){ +@@ -681,7 +673,7 @@ + uint8_t *pbuf_ptr=full_frame->b_rptr; + uint8_t *buf_end=full_frame->b_wptr; + +- ms_message("image size: %i)", buf_end-pbuf_ptr); ++ ms_message("image size: %li)", (long)(buf_end-pbuf_ptr)); + + *lqt=NULL; + *cqt=NULL; +@@ -689,7 +681,7 @@ + err = find_marker(&pbuf_ptr, buf_end); + while (err!=-1) + { +- ms_message("marker found: %x (offset from beginning%i)", err, pbuf_ptr-full_frame->b_rptr); ++ ms_message("marker found: %x (offset from beginning %li)", err, (long)(pbuf_ptr-full_frame->b_rptr)); + if (err==0xdb) + { + /* copy DQT table */ +@@ -772,10 +764,12 @@ + int error; + mblk_t *comp_buf=s->comp_buf; + int comp_buf_sz=comp_buf->b_datap->db_lim-comp_buf->b_datap->db_base; ++ YuvBuf yuv; + ++ ms_yuv_buf_init_from_mblk(&yuv, inm); + /* convert image if necessary */ + avcodec_get_frame_defaults(&pict); +- avpicture_fill((AVPicture*)&pict,(uint8_t*)inm->b_rptr,c->pix_fmt,c->width,c->height); ++ avpicture_fill((AVPicture*)&pict,yuv.planes[0],c->pix_fmt,c->width,c->height); + + /* timestamp used by ffmpeg, unset here */ + pict.pts=AV_NOPTS_VALUE; +@@ -796,7 +790,9 @@ + comp_buf->b_wptr+=4; + comp_buf_sz-=4; + } ++ + error=avcodec_encode_video(c, (uint8_t*)comp_buf->b_wptr,comp_buf_sz, &pict); ++ + if (error<=0) ms_warning("ms_AVencoder_process: error %i.",error); + else{ + s->framenum++; +@@ -837,6 +833,14 @@ + EncState *s=(EncState*)f->data; + bool_t snow=s->codec==CODEC_ID_SNOW; + s->maxbr=*(int*)arg; ++ if (s->av_context.codec!=NULL){ ++ /*when we are processing, apply new settings immediately*/ ++ ms_filter_lock(f); ++ enc_postprocess(f); ++ enc_preprocess(f); ++ ms_filter_unlock(f); ++ return 0; ++ } + if (s->maxbr>=1024000 && s->codec!=CODEC_ID_H263P){ + s->vsize.width = MS_VIDEO_SIZE_SVGA_W; + s->vsize.height = MS_VIDEO_SIZE_SVGA_H; +@@ -854,7 +858,7 @@ + s->vsize.height=MS_VIDEO_SIZE_CIF_H; + s->fps=17; + s->qmin=3; +- }else if (s->maxbr>=170000){ ++ }else if (s->maxbr>=170000 && s->codec!=CODEC_ID_H263P && s->codec!=CODEC_ID_H263){ + s->vsize.width=MS_VIDEO_SIZE_QVGA_W; + s->vsize.height=MS_VIDEO_SIZE_QVGA_H; + s->fps=15; +@@ -875,14 +879,6 @@ + s->fps=5; + s->qmin=5; + } +- +- if (s->av_context.codec!=NULL){ +- /*apply new settings dynamically*/ +- ms_filter_lock(f); +- enc_postprocess(f); +- enc_preprocess(f); +- ms_filter_unlock(f); +- } + return 0; + } + diff --git a/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild b/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild index bb566d1f9d14..cd537c69e7f3 100644 --- a/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild +++ b/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild,v 1.13 2012/05/05 08:02:25 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.7.3-r3.ebuild,v 1.14 2012/11/07 11:40:25 aballier Exp $ EAPI="4" @@ -67,6 +67,8 @@ src_prepare() { epatch "${FILESDIR}/${PN}-2.7.3-v4l-automagic.patch" epatch "${FILESDIR}/${P}-sdl-build.patch" + epatch "${FILESDIR}/${P}-videoenc_282.patch" + epatch "${FILESDIR}/${P}-ffmpeg-0.11.patch" # linux/videodev.h dropped in 2.6.38 sed -i -e 's:msv4l.c::' src/Makefile.am || die diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 3b94cd8d712d..647b73e0c4f6 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Wed, 07 Nov 2012 11:37:00 +0000 +Wed, 07 Nov 2012 16:37:01 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 54a93a1492a1..031b3bcde9be 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Wed, 07 Nov 2012 11:37:01 +0000 +Wed, 07 Nov 2012 16:37:02 +0000 diff --git a/metadata/md5-cache/app-admin/ranpwd-1.2 b/metadata/md5-cache/app-admin/ranpwd-1.2 index 62b4549ba9a4..8d6a0846c45d 100644 --- a/metadata/md5-cache/app-admin/ranpwd-1.2 +++ b/metadata/md5-cache/app-admin/ranpwd-1.2 @@ -2,8 +2,8 @@ DEFINED_PHASES=install test DESCRIPTION=Generate random passwords using the in-kernel cryptographically secure random number generator EAPI=3 HOMEPAGE=http://www.kernel.org/pub/software/utils/admin/ranpwd/ -KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 +KEYWORDS=~amd64 ~ia64 ppc ppc64 ~x86 LICENSE=GPL-2 SLOT=0 SRC_URI=mirror://kernel/software/utils/admin/ranpwd/ranpwd-1.2.tar.gz -_md5_=c9f9ec80d5098ff98cc72ab6c4885302 +_md5_=c397dc2ff6546e1093243f42c5819774 diff --git a/metadata/md5-cache/app-crypt/gpgme-1.3.2 b/metadata/md5-cache/app-crypt/gpgme-1.3.2 index 805d98e8d2bd..ac19b85d7d19 100644 --- a/metadata/md5-cache/app-crypt/gpgme-1.3.2 +++ b/metadata/md5-cache/app-crypt/gpgme-1.3.2 @@ -4,10 +4,10 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use EAPI=4 HOMEPAGE=http://www.gnupg.org/related_software/gpgme IUSE=common-lisp static-libs -KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris +KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris LICENSE=GPL-2 LGPL-2.1 RDEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.4 SLOT=1 SRC_URI=mirror://gnupg/gpgme/gpgme-1.3.2.tar.bz2 _eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=0253a95e51aecbf0bd299cab08c7e934 +_md5_=3b5e5d4b2713bd2a079c1ca00a2ba4c1 diff --git a/metadata/md5-cache/app-crypt/keynote-2.3-r3 b/metadata/md5-cache/app-crypt/keynote-2.3-r3 new file mode 100644 index 000000000000..f28d9246fe36 --- /dev/null +++ b/metadata/md5-cache/app-crypt/keynote-2.3-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare setup +DEPEND=ssl? ( dev-libs/openssl ) virtual/yacc +DESCRIPTION=The KeyNote Trust-Management System +EAPI=5 +HOMEPAGE=http://www1.cs.columbia.edu/~angelos/keynote.html +IUSE=ssl +KEYWORDS=~amd64 ~x86 +LICENSE=as-is +RDEPEND=ssl? ( dev-libs/openssl ) +SLOT=0 +SRC_URI=http://www1.cs.columbia.edu/~angelos/Code/keynote-2.3.tar.gz +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=1cc3732befde136f59d91c8574db9b2c diff --git a/metadata/md5-cache/app-emulation/bochs-2.6 b/metadata/md5-cache/app-emulation/bochs-2.6 new file mode 100644 index 000000000000..3834cb4693bc --- /dev/null +++ b/metadata/md5-cache/app-emulation/bochs-2.6 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure prepare +DEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) readline? ( sys-libs/readline ) ncurses? ( sys-libs/ncurses ) doc? ( app-text/docbook-sgml-utils ) X? ( x11-proto/xproto ) sys-apps/sed >=app-text/opensp-1.5 +DESCRIPTION=LGPL-ed pc emulator +EAPI=4 +HOMEPAGE=http://bochs.sourceforge.net/ +IUSE=3dnow avx debugger doc gdb ncurses readline svga sdl +smp wxwidgets vnc X +x86-64 +KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 +LICENSE=LGPL-2.1 +RDEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) readline? ( sys-libs/readline ) ncurses? ( sys-libs/ncurses ) +REQUIRED_USE=avx? ( x86-64 ) gdb? ( !debugger !smp ) debugger? ( !gdb ) +SLOT=0 +SRC_URI=mirror://sourceforge/bochs/bochs-2.6.tar.gz +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 wxwidgets fb1a306837717dfa2af841ecdf929565 +_md5_=f6a90b55d29029b8fd6e72a59d70199d diff --git a/metadata/md5-cache/app-misc/screen-4.0.3-r5 b/metadata/md5-cache/app-misc/screen-4.0.3-r6 similarity index 96% rename from metadata/md5-cache/app-misc/screen-4.0.3-r5 rename to metadata/md5-cache/app-misc/screen-4.0.3-r6 index 5bdd500a297d..22750dcd1e99 100644 --- a/metadata/md5-cache/app-misc/screen-4.0.3-r5 +++ b/metadata/md5-cache/app-misc/screen-4.0.3-r6 @@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinu SLOT=0 SRC_URI=ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.3.tar.gz _eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=deb1995c1588cfd42e59351ca2312bfe +_md5_=220bb2eeb7ff07aa1bbe868560ac7ed2 diff --git a/metadata/md5-cache/app-office/texmaker-3.5.2 b/metadata/md5-cache/app-office/texmaker-3.5.2 new file mode 100644 index 000000000000..90f9660b93fa --- /dev/null +++ b/metadata/md5-cache/app-office/texmaker-3.5.2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install postinst prepare unpack +DEPEND=app-text/poppler[qt4] sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/qt-webkit:4 app-text/hunspell virtual/pkgconfig +DESCRIPTION=A nice LaTeX-IDE +EAPI=4 +HOMEPAGE=http://www.xm1math.net/texmaker/ +KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=app-text/poppler[qt4] sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/qt-webkit:4 app-text/hunspell virtual/latex-base app-text/psutils app-text/ghostscript-gpl media-libs/netpbm +SLOT=0 +SRC_URI=http://www.xm1math.net/texmaker/texmaker-3.5.2.tar.bz2 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-r2 75aa32643ef22632eb9b45989b4c03fc toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=1a1055c23de30e4af28652b8427d84ad diff --git a/metadata/md5-cache/app-office/texmakerx-2.1 b/metadata/md5-cache/app-office/texmakerx-2.1 deleted file mode 100644 index 04fda7c239e5..000000000000 --- a/metadata/md5-cache/app-office/texmakerx-2.1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare unpack -DEPEND=app-text/hunspell app-text/poppler[qt4] x11-libs/libX11 x11-libs/libXext >=x11-libs/qt-gui-4.6.1:4 >=x11-libs/qt-core-4.6.1:4 >=x11-libs/qt-script-4.6.1:4 >=x11-libs/qt-test-4.6.1:4 >=x11-libs/qt-webkit-4.6.1:4 virtual/pkgconfig -DESCRIPTION=Fork of the LaTeX IDE TexMaker -EAPI=4 -HOMEPAGE=http://texmakerx.sourceforge.net/ -KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=app-text/hunspell app-text/poppler[qt4] x11-libs/libX11 x11-libs/libXext >=x11-libs/qt-gui-4.6.1:4 >=x11-libs/qt-core-4.6.1:4 >=x11-libs/qt-script-4.6.1:4 >=x11-libs/qt-test-4.6.1:4 >=x11-libs/qt-webkit-4.6.1:4 virtual/latex-base app-text/psutils app-text/ghostscript-gpl media-libs/netpbm -SLOT=0 -SRC_URI=mirror://sourceforge/texmakerx/texmakerx/TexMakerX%202.1/texmakerx-2.1.tar.gz -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 qt4-r2 75aa32643ef22632eb9b45989b4c03fc toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=f39693c969143918437485e07b4f2852 diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7 index f1eb5e81ae15..e98a25fd3d2b 100644 --- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7 +++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7 @@ -8,5 +8,5 @@ LICENSE=GPL-2 RDEPEND=sys-apps/portage >=dev-lang/python-2.6[xml] !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep virtual/python-argparse dev-lang/python[xml] dev-lang/python SLOT=0 SRC_URI=mirror://gentoo/gentoolkit-0.3.0.7.tar.gz -_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=2836f20e253d2c2b26540bbdd5ce0b9e +_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 +_md5_=4ccc53cc26794651641feb04d911cba5 diff --git a/metadata/md5-cache/dev-lang/v8-3.12.19.15 b/metadata/md5-cache/dev-lang/v8-3.12.19.15 deleted file mode 100644 index 80b8650b2b05..000000000000 --- a/metadata/md5-cache/dev-lang/v8-3.12.19.15 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst preinst prepare setup test -DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -DESCRIPTION=Google's open source JavaScript engine -EAPI=4 -HOMEPAGE=http://code.google.com/p/v8 -KEYWORDS=amd64 x86 ~x86-fbsd ~x64-macos ~x86-macos -LICENSE=BSD -RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -SLOT=0 -SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.12.19.15.tar.bz2 -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=bdf577535fe38e4b98a25a635e09ab63 diff --git a/metadata/md5-cache/dev-lang/v8-3.13.7.4 b/metadata/md5-cache/dev-lang/v8-3.13.7.4 deleted file mode 100644 index 04205954f372..000000000000 --- a/metadata/md5-cache/dev-lang/v8-3.13.7.4 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst preinst prepare setup test -DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -DESCRIPTION=Google's open source JavaScript engine -EAPI=4 -HOMEPAGE=http://code.google.com/p/v8 -KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos -LICENSE=BSD -RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -SLOT=0 -SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.13.7.4.tar.bz2 -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=543bdd862da4227fdc72fc040bf5543b diff --git a/metadata/md5-cache/dev-lang/v8-3.13.7.5 b/metadata/md5-cache/dev-lang/v8-3.13.7.5 index eca15be08941..e400003f1340 100644 --- a/metadata/md5-cache/dev-lang/v8-3.13.7.5 +++ b/metadata/md5-cache/dev-lang/v8-3.13.7.5 @@ -3,10 +3,10 @@ DEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) DESCRIPTION=Google's open source JavaScript engine EAPI=4 HOMEPAGE=http://code.google.com/p/v8 -KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos +KEYWORDS=amd64 ~arm x86 ~x86-fbsd ~x64-macos ~x86-macos LICENSE=BSD RDEPEND=|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) SLOT=0 SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.13.7.5.tar.bz2 _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=66dcb9c7f55642cb50b9073726e803fb +_md5_=e6d40e1662362cd3d69f068feead326c diff --git a/metadata/md5-cache/dev-python/guppy-0.1.9-r2 b/metadata/md5-cache/dev-python/guppy-0.1.9-r2 index c6c0005ec2d0..1324ef4b80ee 100644 --- a/metadata/md5-cache/dev-python/guppy-0.1.9-r2 +++ b/metadata/md5-cache/dev-python/guppy-0.1.9-r2 @@ -8,5 +8,5 @@ LICENSE=MIT RDEPEND==dev-lang/python-2* SLOT=0 SRC_URI=mirror://pypi/g/guppy/guppy-0.1.9.tar.gz -_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 -_md5_=c4c66383f1390ec7a341c0d802ed4352 +_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=cee96ae37480680f16dda73bb78b3d2d diff --git a/metadata/md5-cache/dev-python/wehjit-0.2.2 b/metadata/md5-cache/dev-python/wehjit-0.2.2 index bd85ab2f88bf..81fda47edb34 100644 --- a/metadata/md5-cache/dev-python/wehjit-0.2.2 +++ b/metadata/md5-cache/dev-python/wehjit-0.2.2 @@ -1,13 +1,12 @@ DEFINED_PHASES=compile install postinst postrm prepare test -DEPEND=dev-python/genshi dev-python/assets dev-python/paste dev-python/pygments dev-lang/python test? ( dev-python/nose ) +DEPEND=dev-python/genshi dev-python/assets dev-python/paste dev-python/pygments dev-lang/python DESCRIPTION=A Python web-widget library EAPI=3 HOMEPAGE=http://jderose.fedorapeople.org/wehjit -IUSE=test KEYWORDS=~x86 ~amd64 LICENSE=GPL-3 RDEPEND=dev-python/genshi dev-python/assets dev-python/paste dev-python/pygments dev-lang/python SLOT=0 SRC_URI=http://jderose.fedorapeople.org/wehjit/0.2.2/wehjit-0.2.2.tar.gz -_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 -_md5_=225f230a961a4b039988eefce3ee2bba +_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=4d255502dca632adf8acd43b0ba1cde6 diff --git a/metadata/md5-cache/dev-scheme/elk-3.99.8 b/metadata/md5-cache/dev-scheme/elk-3.99.8 new file mode 100644 index 000000000000..5422d3d84315 --- /dev/null +++ b/metadata/md5-cache/dev-scheme/elk-3.99.8 @@ -0,0 +1,9 @@ +DEFINED_PHASES=compile install test +DESCRIPTION=Scheme implementation designed to be embeddable extension to C/C++ applications +EAPI=4 +HOMEPAGE=http://sam.zoy.org/elk +KEYWORDS=~amd64 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://sam.zoy.org/elk/elk-3.99.8.tar.bz2 +_md5_=ae598b89a979c89545be2bb8b5efdd73 diff --git a/metadata/md5-cache/dev-util/cpptest-1.1.2 b/metadata/md5-cache/dev-util/cpptest-1.1.2 index 82f5d8e256a6..2e1d35eec4cf 100644 --- a/metadata/md5-cache/dev-util/cpptest-1.1.2 +++ b/metadata/md5-cache/dev-util/cpptest-1.1.2 @@ -4,9 +4,9 @@ DESCRIPTION=Simple but powerful unit testing framework for C++ EAPI=4 HOMEPAGE=http://cpptest.sourceforge.net/ IUSE=doc -KEYWORDS=amd64 ~ppc ~ppc64 ~sparc ~x86 +KEYWORDS=amd64 ppc ppc64 ~sparc ~x86 LICENSE=LGPL-2.1 SLOT=0 SRC_URI=mirror://sourceforge/cpptest/cpptest-1.1.2.tar.gz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=76541bf94b68566bbb6a4f3379fc903c +_md5_=e2843ad0f1e256b077b3956ff1826ead diff --git a/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.5 b/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.5 index f93cb56a8fba..07ff3c50b59b 100644 --- a/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.5 +++ b/metadata/md5-cache/kde-misc/networkmanagement-0.9.0.5 @@ -4,10 +4,10 @@ DESCRIPTION=KDE frontend for NetworkManager EAPI=4 HOMEPAGE=http://www.kde.org/ IUSE=debug linguas_ar linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fa linguas_fi linguas_ga linguas_hu linguas_it linguas_ja linguas_kk linguas_km linguas_lt linguas_nb linguas_nds linguas_nl linguas_nn linguas_pl linguas_pt linguas_pt_BR linguas_se linguas_sk linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv linguas_tr linguas_uk linguas_zh_TW aqua -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=GPL-2 LGPL-2 RDEPEND=>=kde-base/solid-4.4:4[aqua=] net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.0 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fa(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_se? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_se(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr(+)] ) linguas_sr@ijekavian? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavian(+)] ) linguas_sr@ijekavianlatin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@ijekavianlatin(+)] ) linguas_sr@latin? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sr@latin(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] SLOT=4 SRC_URI=mirror://kde/unstable/networkmanagement/0.9.0.5/src/networkmanagement-0.9.0.5.tar.bz2 _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils d9d351169c1d554e8f47f1a19f17becd eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 6e4e3fc3a36f43b71c84ad615e804a83 kde4-functions 37767566f9ffa88075c4d392a59100a9 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=2e123646829d2562a08d3df89226d663 +_md5_=0e3ef823c9c6a1d8923218fbf31b6eff diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.8.0 b/metadata/md5-cache/mail-filter/amavisd-new-2.8.0 new file mode 100644 index 000000000000..eff3bfb76e2d --- /dev/null +++ b/metadata/md5-cache/mail-filter/amavisd-new-2.8.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install postinst preinst prepare +DEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.8.2 +DESCRIPTION=High-performance interface between the MTA and content checkers. +EAPI=4 +HOMEPAGE=http://www.ijs.si/software/amavisd/ +IUSE=courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.8.2 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 dev-perl/Convert-TNEF >=dev-perl/Convert-UUlib-1.08 virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/net-server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy dev-perl/IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog sys-apps/file >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/mta ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin ) zmq? ( dev-perl/ZMQ-LibZMQ2 ) +SLOT=0 +SRC_URI=http://www.ijs.si/software/amavisd/amavisd-new-2.8.0.tar.xz +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=d762097c746b85ad63b42bcd50677562 diff --git a/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3 b/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3 index 5c0176755e35..e1cd404445ba 100644 --- a/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3 +++ b/metadata/md5-cache/media-libs/mediastreamer-2.7.3-r3 @@ -12,4 +12,4 @@ REQUIRED_USE=|| ( oss alsa jack portaudio coreaudio pulseaudio ) video? ( || ( s SLOT=0 SRC_URI=mirror://nongnu/linphone/mediastreamer/mediastreamer-2.7.3.tar.gz _eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=7dbab6f3994cbbcd50b0268fb851115f +_md5_=e993c431f61e41aa8cb01b9d12bead10 diff --git a/metadata/md5-cache/net-analyzer/bwmon-1.3-r2 b/metadata/md5-cache/net-analyzer/bwmon-1.3-r2 index bdad7517d163..3caf9e6624f4 100644 --- a/metadata/md5-cache/net-analyzer/bwmon-1.3-r2 +++ b/metadata/md5-cache/net-analyzer/bwmon-1.3-r2 @@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses DESCRIPTION=Simple ncurses bandwidth monitor EAPI=4 HOMEPAGE=http://bwmon.sourceforge.net/ -KEYWORDS=amd64 hppa ~ppc ~sparc ~x86 +KEYWORDS=amd64 hppa ppc ~sparc ~x86 LICENSE=GPL-2 public-domain RDEPEND=sys-libs/ncurses SLOT=0 SRC_URI=mirror://sourceforge/bwmon/bwmon-1.3.tar.gz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=7f046a6215870d10e3d07b198107cc25 +_md5_=dac3d42b56c81d5de1bc0672cdc65a8a diff --git a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2 b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2 index b96bd910ed05..58d1825b30d2 100644 --- a/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2 +++ b/metadata/md5-cache/net-wireless/spectools-2011.08.1-r2 @@ -4,10 +4,10 @@ DESCRIPTION=Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware EAPI=4 HOMEPAGE=http://www.kismetwireless.net/spectools/ IUSE=ncurses gtk -KEYWORDS=amd64 ~arm ~ppc ~x86 +KEYWORDS=amd64 arm ppc ~x86 LICENSE=GPL-2 RDEPEND=virtual/libusb:0 ncurses? ( sys-libs/ncurses ) gtk? ( x11-libs/gtk+:2 ) SLOT=0 SRC_URI=http://www.kismetwireless.net/code/spectools-2011-08-R1.tar.gz _eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 -_md5_=fb0b097201f63a3c0d18f6d8d0620b63 +_md5_=2c4dfdb0d2b090c2e13213d07c6db9da diff --git a/metadata/md5-cache/sys-apps/dstat-0.7.2-r1 b/metadata/md5-cache/sys-apps/dstat-0.7.2-r1 index 2beeaeffa577..f37a97e353dc 100644 --- a/metadata/md5-cache/sys-apps/dstat-0.7.2-r1 +++ b/metadata/md5-cache/sys-apps/dstat-0.7.2-r1 @@ -4,10 +4,10 @@ DESCRIPTION=Versatile replacement for vmstat, iostat and ifstat EAPI=4 HOMEPAGE=http://dag.wieers.com/home-made/dstat/ IUSE=wifi -KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux +KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux LICENSE=GPL-2 RDEPEND=wifi? ( net-wireless/python-wifi ) =dev-lang/python-2* SLOT=0 SRC_URI=http://dag.wieers.com/home-made/dstat/dstat-0.7.2.tar.bz2 _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=c761f1a8f566fdaa6d1171a16b4478bd +_md5_=4f051d9ebe3179a4a41d9263492dc498 diff --git a/metadata/md5-cache/sys-apps/grep-2.14 b/metadata/md5-cache/sys-apps/grep-2.14 index ffa9c7d0286a..a2184027dfed 100644 --- a/metadata/md5-cache/sys-apps/grep-2.14 +++ b/metadata/md5-cache/sys-apps/grep-2.14 @@ -4,9 +4,9 @@ DESCRIPTION=GNU regular expression matcher EAPI=3 HOMEPAGE=http://www.gnu.org/software/grep/ IUSE=nls pcre -KEYWORDS=~alpha amd64 ~arm 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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +KEYWORDS=~alpha amd64 arm 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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-3 RDEPEND=nls? ( virtual/libintl ) pcre? ( >=dev-libs/libpcre-7.8-r1 ) virtual/libiconv SLOT=0 SRC_URI=mirror://gnu/grep/grep-2.14.tar.xz mirror://gentoo/grep-2.14.tar.xz -_md5_=369088db48e59924fb9195cc17da032f +_md5_=cc1a58e5366f714daad7ff627fda2980 diff --git a/metadata/md5-cache/sys-apps/openrc-9999 b/metadata/md5-cache/sys-apps/openrc-9999 index 4f01d12ccc8c..0e82fb4816fc 100644 --- a/metadata/md5-cache/sys-apps/openrc-9999 +++ b/metadata/md5-cache/sys-apps/openrc-9999 @@ -8,4 +8,4 @@ LICENSE=BSD-2 RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !=mail-mta/ssmtp-2.64-r2[mta] =mail-mta/msmtp-1.4.19-r1[mta] =mail-mta/ssmtp-2.64-r2[mta] =mail-mta/msmtp-1.4.19-r1[mta] =net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 dev-libs/dbus-glib >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) -DESCRIPTION=Open-source version of Google Chrome web browser -EAPI=4 -HOMEPAGE=http://chromium.org/ -IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test -KEYWORDS=amd64 x86 -LICENSE=BSD -RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 dev-libs/dbus-glib >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -SLOT=0 -SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.94.tar.bz2 -_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=122ba60705a7540e3253871f0b5d06ba diff --git a/metadata/md5-cache/www-client/chromium-23.0.1271.40 b/metadata/md5-cache/www-client/chromium-23.0.1271.40 deleted file mode 100644 index 4669bafd943c..000000000000 --- a/metadata/md5-cache/www-client/chromium-23.0.1271.40 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) -DESCRIPTION=Open-source version of Google Chrome web browser -EAPI=4 -HOMEPAGE=http://chromium.org/ -IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -SLOT=0 -SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.40.tar.bz2 -_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=f2fd7ab0f1a3077a9100cfe299ff6584 diff --git a/metadata/md5-cache/www-client/chromium-23.0.1271.60 b/metadata/md5-cache/www-client/chromium-23.0.1271.60 deleted file mode 100644 index caa50ad0d989..000000000000 --- a/metadata/md5-cache/www-client/chromium-23.0.1271.60 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) -DESCRIPTION=Open-source version of Google Chrome web browser -EAPI=4 -HOMEPAGE=http://chromium.org/ -IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test -KEYWORDS=~amd64 ~x86 -LICENSE=BSD -RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -SLOT=0 -SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.60.tar.bz2 -_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=46cef513843158ccf1057c0966d4ab58 diff --git a/metadata/md5-cache/www-client/chromium-23.0.1271.64 b/metadata/md5-cache/www-client/chromium-23.0.1271.64 index c570ab31f0e5..2f158a7d4825 100644 --- a/metadata/md5-cache/www-client/chromium-23.0.1271.64 +++ b/metadata/md5-cache/www-client/chromium-23.0.1271.64 @@ -4,10 +4,10 @@ DESCRIPTION=Open-source version of Google Chrome web browser EAPI=4 HOMEPAGE=http://chromium.org/ IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=BSD RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus sys-fs/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) SLOT=0 SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.64.tar.bz2 _eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 192fcbe64c4a25ea391beffaaeca2537 gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python 3db636724bc2886c6425058e210067d2 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=9e3b2e8ee05bb309e2f4d89c2c8c68c5 +_md5_=3004c9f61fa4c5d62d1790ed92d52ff6 diff --git a/metadata/md5-cache/www-client/opera-12.11.1653 b/metadata/md5-cache/www-client/opera-12.11.1653 new file mode 100644 index 000000000000..9b2b9eb564e5 --- /dev/null +++ b/metadata/md5-cache/www-client/opera-12.11.1653 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install postinst postrm preinst prepare unpack +DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4 +DESCRIPTION=A fast and secure web browser and Internet suite +EAPI=4 +HOMEPAGE=http://www.opera.com/ +IUSE=elibc_FreeBSD gtk kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu +KEYWORDS=~amd64 ~x86 ~x86-fbsd +LICENSE=OPERA-12 LGPL-2 LGPL-3 +RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core:4 x11-libs/qt-gui:4 ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base media-libs/gstreamer media-plugins/gst-plugins-meta ) +SLOT=0 +SRC_URI=amd64? ( http://snapshot.opera.com/unix/19084_12.11-1653/opera-12.11-1653.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/19084_12.11-1653/opera-12.11-1653.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/19084_12.11-1653/opera-12.11-1653.i386.freebsd.tar.xz ) +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 794d2847b4af390a1e020924876c8297 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=512a35d51f9dd4aa24b1959ed691d813 diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.243 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.243 deleted file mode 100644 index 6b74c3436965..000000000000 --- a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.243 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install postinst pretend setup unpack -DEPEND=amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) ) -DESCRIPTION=Adobe Flash Player -EAPI=4 -HOMEPAGE=http://www.adobe.com/products/flashplayer.html -IUSE=multilib -32bit +64bit vdpau kde +sse2check -KEYWORDS=-* amd64 x86 -LICENSE=AdobeFlash-10.3 -RDEPEND=x86? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) amd64? ( multilib? ( 64bit? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) 32bit? ( vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 app-emulation/emul-linux-x86-soundlibs ) ) !multilib? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) ) -RESTRICT=strip mirror -SLOT=0 -SRC_URI=x86? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.243/install_flash_player_11_linux_i386.tar.gz -> adobe-flash-11.2.202.243.i386.tar.gz ) amd64? ( multilib? ( 32bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.243/install_flash_player_11_linux_i386.tar.gz -> adobe-flash-11.2.202.243.i386.tar.gz ) 64bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.243/install_flash_player_11_linux_x86_64.tar.gz -> adobe-flash-11.2.202.243.x86_64.tar.gz ) ) !multilib? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.243/install_flash_player_11_linux_x86_64.tar.gz -> adobe-flash-11.2.202.243.x86_64.tar.gz ) ) -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 nsplugins b195a1306f4ee7cf507037dc6aa5ba89 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=ed1c4ebcc86bd17ad09fd94835935079 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index eb94b03b6931..0e580dbedec5 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Wed, 07 Nov 2012 11:37:03 +0000 +Wed, 07 Nov 2012 16:37:04 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 55b1f06681be..212c8904cd29 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Wed Nov 7 11:37:00 UTC 2012 +Wed Nov 7 16:37:01 UTC 2012 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 85b1edb92e09..a0700fbe3fdb 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Wed, 07 Nov 2012 12:00:01 +0000 +Wed, 07 Nov 2012 17:00:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 0ab8a43c34c1..81a7fd7df21c 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1352288101 Wed Nov 7 11:35:01 2012 UTC +1352306101 Wed Nov 7 16:35:01 2012 UTC diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild index 32301bc18561..d9434b931201 100644 --- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild +++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3-r2.ebuild,v 1.3 2012/11/07 03:23:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3-r2.ebuild,v 1.4 2012/11/07 13:14:40 blueness Exp $ EAPI="4" @@ -15,7 +15,7 @@ RDEPEND="${DEPEND}" SLOT="0" LICENSE="GPL-2 public-domain" -KEYWORDS="amd64 hppa ~ppc ~sparc ~x86" +KEYWORDS="amd64 hppa ppc ~sparc ~x86" IUSE="" src_prepare() { diff --git a/net-wireless/spectools/spectools-2011.08.1-r2.ebuild b/net-wireless/spectools/spectools-2011.08.1-r2.ebuild index 3cf64b92549f..6058eb7013ec 100644 --- a/net-wireless/spectools/spectools-2011.08.1-r2.ebuild +++ b/net-wireless/spectools/spectools-2011.08.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r2.ebuild,v 1.2 2012/11/06 17:08:46 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/spectools/spectools-2011.08.1-r2.ebuild,v 1.4 2012/11/07 13:27:51 blueness Exp $ EAPI=4 inherit toolchain-funcs @@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then KEYWORDS="" else SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm ~ppc ~x86" + KEYWORDS="amd64 arm ppc ~x86" fi DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware" diff --git a/profiles/package.mask b/profiles/package.mask index 00b29c8bb1a9..3e1b8684125b 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14198 2012/11/06 22:30:01 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14199 2012/11/07 16:07:20 jer Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -591,6 +591,7 @@ sys-apps/systemd-sysv-utils # Opera Next and Opera snapshots are unsupported and eternally unstable. # www-client/opera-next +=www-client/opera-12.11* # Hanno Boeck (15 Dec 2011) # Breaks pam_mount, which is its only user in the tree. diff --git a/profiles/updates/4Q-2012 b/profiles/updates/4Q-2012 index 6a5369d87a8e..b0699e7bdd56 100644 --- a/profiles/updates/4Q-2012 +++ b/profiles/updates/4Q-2012 @@ -42,3 +42,4 @@ slotmove dev-util/boost-build 1.50 0 slotmove dev-util/boost-build 1.51 0 slotmove net-im/emesene 2 0 move sci-chemistry/mmtk sci-libs/mmtk +move app-office/texmakerx app-office/texstudio diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 4180e086860d..fd95802c4a5c 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -405,7 +405,10 @@ app-emacs/slime:xref - Install xref.lisp cross-referencing tool app-emacs/vm:bbdb - Include support for app-emacs/bbdb app-emacs/wanderlust:bbdb - Include support for app-emacs/bbdb app-emacs/wikipedia-mode:outline-magic - Enable support for outline-mode extensions (app-emacs/outline-magic) -app-emulation/bochs:debugger - Enable the bochs debugger +app-emulation/bochs:avx - Enable support for Advanced Vector Extensions (AVX) +app-emulation/bochs:debugger - Enable debugger (slows down emulation) +app-emulation/bochs:gdb - Enable support for the remote GDB stub +app-emulation/bochs:x86-64 - Enable support for emulation of 64-bit CPUs app-emulation/e-uae:capslib - Add CAPS library support app-emulation/e-uae:sdl-sound - Use media-libs/sdl-sound for audio output app-emulation/emul-linux-x86-baselibs:development - Install pkgconfig files @@ -2381,6 +2384,7 @@ mail-filter/amavisd-new:dkim - Add DomainKeys Identified Mail support mail-filter/amavisd-new:qmail - Add qmail support mail-filter/amavisd-new:razor - Add support for mail-filter/razor mail-filter/amavisd-new:spamassassin - Add support for mail-filter/spamassassin +mail-filter/amavisd-new:zmq - Add support for zeromq sockets mail-filter/ask:procmail - Adds support for mail-filter/procmail mail-filter/assp:spf - Adds support for Sender Policy Framework mail-filter/assp:srs - Adds support for Sender Rewriting Scheme diff --git a/sys-apps/dstat/dstat-0.7.2-r1.ebuild b/sys-apps/dstat/dstat-0.7.2-r1.ebuild index 547225f889ff..6e00d91609a6 100644 --- a/sys-apps/dstat/dstat-0.7.2-r1.ebuild +++ b/sys-apps/dstat/dstat-0.7.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.7.2-r1.ebuild,v 1.7 2012/11/07 10:42:33 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.7.2-r1.ebuild,v 1.8 2012/11/07 13:10:16 blueness Exp $ EAPI=4 @@ -14,7 +14,7 @@ SRC_URI="http://dag.wieers.com/home-made/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="wifi" RDEPEND="wifi? ( net-wireless/python-wifi )" diff --git a/sys-apps/grep/grep-2.14.ebuild b/sys-apps/grep/grep-2.14.ebuild index 32b7a860f6df..70474482f48e 100644 --- a/sys-apps/grep/grep-2.14.ebuild +++ b/sys-apps/grep/grep-2.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.14.ebuild,v 1.3 2012/11/07 04:38:21 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.14.ebuild,v 1.4 2012/11/07 13:00:47 blueness Exp $ EAPI="3" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm 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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm 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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls pcre" RDEPEND="nls? ( virtual/libintl ) diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index 3cd60fa98a2a..8a179bda7366 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.114 2012/10/31 23:43:01 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.115 2012/11/07 14:59:23 williamh Exp $ EAPI=4 @@ -141,24 +141,24 @@ add_boot_init() { local runlevel=${2:-boot} # if the initscript is not going to be installed and is not # currently installed, return - [[ -e ${ED}/etc/init.d/${initd} || -e ${EROOT}/etc/init.d/${initd} ]] \ + [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ || return - [[ -e ${EROOT}/etc/runlevels/${runlevel}/${initd} ]] && return + [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return # if runlevels dont exist just yet, then create it but still flag # to pkg_postinst that it needs real setup #277323 - if [[ ! -d ${EROOT}/etc/runlevels/${runlevel} ]] ; then - mkdir -p "${EROOT}"/etc/runlevels/${runlevel} - touch "${EROOT}"/etc/runlevels/.add_boot_init.created + if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then + mkdir -p "${EROOT}"etc/runlevels/${runlevel} + touch "${EROOT}"etc/runlevels/.add_boot_init.created fi elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf "${EROOT}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/${runlevel}/${initd} + ln -snf "${EROOT}"etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} } add_boot_init_mit_config() { local config=$1 initd=$2 if [[ -e ${EROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"/${config}) ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then add_boot_init ${initd} fi fi @@ -172,55 +172,55 @@ pkg_preinst() { # manager doesnt go throwing etc-update crap at us -- postinst is # too late to prevent that. this behavior also lets us keep the # file in the CONTENTS for binary packages. - [[ -e ${EROOT}/etc/conf.d/net ]] && \ - cp "${EROOT}"/etc/conf.d/net "${ED}"/etc/conf.d/ + [[ -e "${EROOT}"etc/conf.d/net ]] && \ + cp "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/ # avoid default thrashing in conf.d files when possible #295406 - if [[ -e ${EROOT}/etc/conf.d/hostname ]] ; then + if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then ( unset hostname HOSTNAME - source "${EROOT}"/etc/conf.d/hostname + source "${EROOT}"etc/conf.d/hostname : ${hostname:=${HOSTNAME}} [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" ) fi # upgrade timezone file ... do it before moving clock - if [[ -e ${EROOT}/etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then + if [[ -e ${EROOT}etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then ( unset TIMEZONE - source "${EROOT}"/etc/conf.d/clock - [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"/etc/timezone + source "${EROOT}"etc/conf.d/clock + [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"etc/timezone ) fi # /etc/conf.d/clock moved to /etc/conf.d/hwclock local clock use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" - if [[ -e ${EROOT}/etc/conf.d/clock ]] ; then - mv "${EROOT}"/etc/conf.d/clock "${EROOT}"/etc/conf.d/${clock} + if [[ -e "${EROOT}"etc/conf.d/clock ]] ; then + mv "${EROOT}"etc/conf.d/clock "${EROOT}"etc/conf.d/${clock} fi - if [[ -e ${EROOT}/etc/init.d/clock ]] ; then - rm -f "${EROOT}"/etc/init.d/clock + if [[ -e "${EROOT}"etc/init.d/clock ]] ; then + rm -f "${EROOT}"etc/init.d/clock fi - if [[ -L ${EROOT}/etc/runlevels/boot/clock ]] ; then - rm -f "${EROOT}"/etc/runlevels/boot/clock - ln -snf /etc/init.d/${clock} "${EROOT}"/etc/runlevels/boot/${clock} + if [[ -L "${EROOT}"etc/runlevels/boot/clock ]] ; then + rm -f "${EROOT}"etc/runlevels/boot/clock + ln -snf /etc/init.d/${clock} "${EROOT}"etc/runlevels/boot/${clock} fi - if [[ -L ${EROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then - rm -f "${EROOT}${LIBDIR}"/rc/init.d/started/clock - ln -snf /etc/init.d/${clock} "${EROOT}${LIBDIR}"/rc/init.d/started/${clock} + if [[ -L "${EROOT}"${LIBDIR}/rc/init.d/started/clock ]] ; then + rm -f "${EROOT}"${LIBDIR}/rc/init.d/started/clock + ln -snf /etc/init.d/${clok} "${EROOT}"${LIBDIR}/rc/init.d/started/${clock} fi # /etc/conf.d/rc is no longer used for configuration - if [[ -e ${EROOT}/etc/conf.d/rc ]] ; then + if [[ -e "${EROOT}"etc/conf.d/rc ]] ; then elog "/etc/conf.d/rc is no longer used for configuration." elog "Please migrate your settings to /etc/rc.conf as applicable" elog "and delete /etc/conf.d/rc" fi # force net init.d scripts into symlinks - for f in "${EROOT}"/etc/init.d/net.* ; do + for f in "${EROOT}"etc/init.d/net.* ; do [[ -e ${f} ]] || continue # catch net.* not matching anything [[ ${f} == */net.lo ]] && continue # real file now [[ ${f} == *.openrc.bak ]] && continue @@ -276,8 +276,8 @@ migrate_udev_init_script() { # >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. migrate_udev_mount_script() { - if [ -e "${EROOT}"/etc/runlevels/sysinit/udev -a \ - ! -e "${EROOT}"/etc/runlevels/sysinit/udev-mount ]; then + if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ + ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then add_boot_init udev-mount sysinit fi return 0 @@ -297,22 +297,22 @@ migrate_from_baselayout_1() { add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt add_boot_init_mit_config /etc/mdadm.conf mdraid add_boot_init_mit_config /etc/evms.conf evms - [[ -e ${EROOT}/sbin/dmsetup ]] && add_boot_init device-mapper - [[ -e ${EROOT}/sbin/vgscan ]] && add_boot_init lvm + [[ -e "${EROOT}"sbin/dmsetup ]] && add_boot_init device-mapper + [[ -e "${EROOT}"sbin/vgscan ]] && add_boot_init lvm elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" elog "init.d scripts. If you use such a thing, make sure you have the" elog "required init.d scripts added to your boot runlevel." # Upgrade our state for baselayout-1 users - if [[ ! -e ${EROOT}${LIBDIR}/rc/init.d/started ]] ; then + if [[ ! -e "${EROOT}"${LIBDIR}/rc/init.d/started ]] ; then ( - [[ -e ${EROOT}/etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc + [[ -e "${EROOT}"etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc svcdir=${svcdir:-/var/lib/init.d} - if [[ ! -d ${EROOT}${svcdir}/started ]] ; then + if [[ ! -d "${EROOT}"${svcdir}/started ]] ; then ewarn "No state found, and no state exists" elog "You should reboot this host" else - mkdir -p "${EROOT}${LIBDIR}/rc/init.d" + mkdir -p "${EROOT}"${LIBDIR}/rc/init.d einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d" mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \ @@ -324,13 +324,13 @@ migrate_from_baselayout_1() { fi # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition - if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then + if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" - rm -f "${EROOT}"/etc/modules.autoload.d/.keep* - rmdir "${EROOT}"/etc/modules.autoload.d 2>/dev/null - if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then + rm -f "${EROOT}"etc/modules.autoload.d/.keep* + rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null + if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then local f v - for f in "${EROOT}"/etc/modules.autoload.d/* ; do + for f in "${EROOT}"etc/modules.autoload.d/* ; do v=${f##*/} v=${v#kernel-} v=${v//[^[:alnum:]]/_} @@ -354,7 +354,7 @@ migrate_from_baselayout_1() { ' "${f}" >> "${ED}"/etc/conf.d/modules done rm -f "${f}" - rmdir "${EROOT}"/etc/modules.autoload.d 2>/dev/null + rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null fi fi } @@ -363,29 +363,29 @@ pkg_postinst() { local LIBDIR=$(get_libdir) # Remove old baselayout links - rm -f "${EROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} - rm -f "${EROOT}"/etc/init.d/{depscan,runscript}.sh + rm -f "${EROOT}"etc/runlevels/boot/{check{fs,root},rmnologin} + rm -f "${EROOT}"etc/init.d/{depscan,runscript}.sh # Make our runlevels if they don't exist - if [[ ! -e ${EROOT}/etc/runlevels ]] || [[ -e ${EROOT}/etc/runlevels/.add_boot_init.created ]] ; then + if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then einfo "Copying across default runlevels" - cp -RPp "${EROOT}"/usr/share/${PN}/runlevels "${EROOT}"/etc - rm -f "${EROOT}"/etc/runlevels/.add_boot_init.created + cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc + rm -f "${EROOT}"etc/runlevels/.add_boot_init.created else - if [[ ! -e ${EROOT}/etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${EROOT}"/etc/runlevels/sysinit - cp -RPp "${EROOT}"/usr/share/${PN}/runlevels/sysinit/* \ - "${EROOT}"/etc/runlevels/sysinit + if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then + mkdir -p "${EROOT}"etc/runlevels/sysinit + cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ + "${EROOT}"etc/runlevels/sysinit fi - if [[ ! -e ${EROOT}/etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${EROOT}"/etc/runlevels/shutdown - cp -RPp "${EROOT}"/usr/share/${PN}/runlevels/shutdown/* \ - "${EROOT}"/etc/runlevels/shutdown + if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then + mkdir -p "${EROOT}"etc/runlevels/shutdown + cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ + "${EROOT}"etc/runlevels/shutdown fi fi # /etc/conf.d/net.example is no longer valid - local NET_EXAMPLE="${EROOT}/etc/conf.d/net.example" + local NET_EXAMPLE="${EROOT}etc/conf.d/net.example" local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' if [[ -e "${NET_EXAMPLE}" ]] ; then if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then @@ -395,11 +395,11 @@ pkg_postinst() { sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" elog "${NET_EXAMPLE} should be removed." fi - elog "The new file is ${EROOT}/usr/share/doc/${PF}/net.example" + elog "The new file is ${EROOT}usr/share/doc/${PF}/net.example" fi # /etc/conf.d/wireless.example is no longer valid - local WIRELESS_EXAMPLE="${EROOT}/etc/conf.d/wireless.example" + local WIRELESS_EXAMPLE="${EROOT}etc/conf.d/wireless.example" local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then @@ -410,11 +410,11 @@ pkg_postinst() { elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." fi elog "If you are using the old style network scripts," - elog "Configure wireless settings in ${EROOT}/etc/conf.d/net" - elog "after reviewing ${EROOT}/usr/share/doc/${PF}/net.example" + elog "Configure wireless settings in ${EROOT}etc/conf.d/net" + elog "after reviewing ${EROOT}usr/share/doc/${PF}/net.example" fi - if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then + if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then ewarn "/etc/modules.autoload.d is no longer used. Please convert" ewarn "your files to /etc/conf.d/modules and delete the directory." fi @@ -450,7 +450,7 @@ pkg_postinst() { local netscript=net.lo fi - if [ ! -e "${EROOT}"/etc/runlevels/boot/${netscript} ]; then + if [ ! -e "${EROOT}"etc/runlevels/boot/${netscript} ]; then ewarn "Please add the $netscript script to your boot runlevel" ewarn "as soon as possible. Not doing so could leave you with a system" ewarn "without networking." @@ -460,7 +460,7 @@ pkg_postinst() { ewarn "satisfies the net virtual." ewarn "If you have services now which do not start because of this," ewarn "They can be fixed by adding rc_need=\"!net\"" - ewarn "to the ${EROOT}/etc/conf.d/ file." + ewarn "to the ${EROOT}etc/conf.d/ file." ewarn "You should also file a bug against the service asking that" ewarn "need net be dropped from the dependencies." ewarn "The bug you file should block the following tracker:" diff --git a/virtual/mta/mta-0.ebuild b/virtual/mta/mta-0.ebuild index 504d037b59ea..d14a82788726 100644 --- a/virtual/mta/mta-0.ebuild +++ b/virtual/mta/mta-0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/mta/mta-0.ebuild,v 1.7 2012/04/26 14:23:30 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/mta/mta-0.ebuild,v 1.8 2012/11/07 11:42:04 eras Exp $ EAPI=3 @@ -24,7 +24,6 @@ RDEPEND="|| ( >=mail-mta/ssmtp-2.64-r2[mta] mail-mta/mini-qmail >=mail-mta/msmtp-1.4.19-r1[mta] web-apps - sysadmin + + tampakrap@gentoo.org + Support for django template style to config files Support for genshi style to config files diff --git a/www-apps/wordpress/metadata.xml b/www-apps/wordpress/metadata.xml index 05d968293837..292b0efa8202 100644 --- a/www-apps/wordpress/metadata.xml +++ b/www-apps/wordpress/metadata.xml @@ -2,5 +2,7 @@ web-apps -sysadmin + + tampakrap@gentoo.org + diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 4423307b448e..497cb09c6283 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,6 +1,3 @@ -DIST chromium-22.0.1229.94.tar.bz2 210379000 SHA256 a0af7e681ef43a7a17b32a1f6e1dc16ffa2a5f725f946ddaeea13660eba31caf SHA512 1565433ed265681b2b0fc931cfc242c47eafd8f66aee26df935fd1c1cf18dfcd03c27e8da940b73bc3a5129778a92ac40f6a3f209a030530a8d370395ad88a20 WHIRLPOOL 95cf8e766f1b3903b3cc8826205f7fa5d826c085e49454c240203162abc090f23ff48779e40c251bf09d2a16060078f66817c87c9063ee4811fb73ba61875e35 -DIST chromium-23.0.1271.40.tar.bz2 217508369 SHA256 80a6c896cdbce8bc0c31367c0de61fdd0b4d0fe5bad247781dc9ecc373ba3e94 SHA512 8b14ed830323bda91542516dc3e2154e274a6c8cf3b687493c81c9a6c65520dd2700988362fdd1d7d3fa6458b6d8c251a23d1f80c9438edbc9ba35be0741dc5e WHIRLPOOL ac2050ecec5d3588961d891573fce881e2491709a46c629353681428f71d7b48fecc4c0de5effadba1e7435603aa29c66e3a930615c664caf70702532f63a335 -DIST chromium-23.0.1271.60.tar.bz2 218496617 SHA256 c25db31ddce24223c4fafa99301a16e029c2b4e3c7621e65d2549ee1d5114af7 SHA512 4b86841f6d3614442ae8e973551f31a75bc2eaafa775b5b63fa6b56f62f8a8a441bdacc13cbde58194a39dce125eb653f9b6d0a431a3af654a36ab123eb2b1f2 WHIRLPOOL 9fe906cdfb475af187679e066d6d70494d44573a44148df2a0736f38c496253d7928439aa3f6012f5c94aa458041d80de057bd2e8a9a0bf11c431fdb83bfcaad DIST chromium-23.0.1271.64.tar.bz2 218498403 SHA256 e894bb22d4747c69fc34b181be3a25e20fd9599ed93f08779df600fe3402ffe7 SHA512 dee210f60951a96aa37760472aa1b90d49492a97642dc8b7a0df5ac712fb393cca98aaf06189e1cd4a4b229e77bca5c30e907d6a7dbabf5d805766ec5e140eb3 WHIRLPOOL f9f630d1dd0aaf5d573cfc353d568b31d6b8fb69578ec63bdd3ee07ef7a55f6ab313c2b8d6a18559fa56b9b37ad43538bc74e23b9823dd4b0482c875fe99fc30 DIST chromium-24.0.1305.3.tar.bz2 231939945 SHA256 dd3e199edd3288883ce7fd50af5eccd9ae3dd871c784c17560170d1b8b2849a4 SHA512 cb5b13a378962fb62463693d3ec681734df9a2439f2db73accd57a6b55a200edf021f5b442c23ac1a2a703d191ce41dc85a168531923f184e378f6435b0d2955 WHIRLPOOL 7a698c8b84a12dbb4c100b4c697ae5725f8df4d1e380d1a8fd0905fedcb578fedeaf73096b99ed7171a04926772d1d7e7ef87e56c1f2762ced9ad7b0458eb8e7 DIST chromium-24.0.1312.1.tar.bz2 185732419 SHA256 80b2c409bf7a20677519883dc0b31ffd13c5b562ae98d32cd0daa80ed18b1df9 SHA512 b32f0536a5638f9fa0e3fae32f7ae721777ad1e30788b174541bffaf11fcfe0b5573cea7d7c5711b0f21640cdd5f5c475e3b1cb279f3d26c38adc59be5b6a60f WHIRLPOOL ed313e34a549091d986a0a022cea51df87233c52b2198ffce0f5d829650504fbff0641734e27c8084c61a1950e2d666c8d4cd3ee197295d7573448678c263c4e diff --git a/www-client/chromium/chromium-22.0.1229.94.ebuild b/www-client/chromium/chromium-22.0.1229.94.ebuild deleted file mode 100644 index c00880cb9d79..000000000000 --- a/www-client/chromium/chromium-22.0.1229.94.ebuild +++ /dev/null @@ -1,457 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-22.0.1229.94.ebuild,v 1.3 2012/10/11 21:10:34 ago Exp $ - -EAPI="4" -PYTHON_DEPEND="2:2.6" - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr - sv sw ta te th tr uk vi zh_CN zh_TW" - -inherit chromium eutils flag-o-matic multilib \ - pax-utils portability python toolchain-funcs versionator virtualx - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux" - -RDEPEND="app-arch/bzip2 - cups? ( - dev-libs/libgcrypt - >=net-print/cups-1.3.11 - ) - >=dev-lang/v8-3.11.10.6 - dev-libs/dbus-glib - >=dev-libs/elfutils-0.149 - dev-libs/expat - >=dev-libs/icu-49.1.1-r1 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2[icu] - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - gnome? ( >=gnome-base/gconf-2.24.0 ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) - >=media-libs/alsa-lib-1.0.19 - media-libs/flac - >=media-libs/libjpeg-turbo-1.2.0-r1 - media-libs/libpng - >=media-libs/libwebp-0.2.0_rc1 - media-libs/speex - pulseaudio? ( media-sound/pulseaudio ) - sys-apps/dbus - sys-fs/udev - virtual/libusb:1 - x11-libs/gtk+:2 - x11-libs/libXinerama - x11-libs/libXScrnSaver - x11-libs/libXtst - kerberos? ( virtual/krb5 ) - selinux? ( - sec-policy/selinux-chromium - sys-libs/libselinux - )" -DEPEND="${RDEPEND} - >=dev-lang/nacl-toolchain-newlib-0_p9093 - dev-lang/perl - dev-lang/yasm - dev-python/ply - dev-python/simplejson - >=dev-util/gperf-3.0.3 - >=sys-devel/bison-2.4.3 - sys-devel/flex - >=sys-devel/make-3.81-r2 - virtual/pkgconfig - test? ( - dev-python/pyftpdlib - )" -RDEPEND+=" - !=www-client/chromium-9999 - x11-misc/xdg-utils - virtual/ttf-fonts" - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -pkg_setup() { - if [[ "${SLOT}" == "0" ]]; then - CHROMIUM_SUFFIX="" - else - CHROMIUM_SUFFIX="-${SLOT}" - fi - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - - # Make sure the build system will use the right python, bug #344367. - python_set_active_version 2 - python_pkg_setup - - if ! use selinux; then - chromium_suid_sandbox_check_kernel_config - fi - - if use bindist; then - elog "bindist enabled: H.264 video support will be disabled." - else - elog "bindist disabled: Resulting binaries may not be legal to re-distribute." - fi -} - -src_prepare() { - ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \ - native_client/toolchain/linux_x86_newlib || die - - # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371. - #sed -i '1i#define OF(x) x' \ - # third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die - - # Fix build without NaCl glibc toolchain. - epatch "${FILESDIR}/${PN}-ppapi-r0.patch" - - epatch_user - - # Remove most bundled libraries. Some are still needed. - find third_party -type f \! -iname '*.gyp*' \ - \! -path 'third_party/WebKit/*' \ - \! -path 'third_party/angle/*' \ - \! -path 'third_party/cacheinvalidation/*' \ - \! -path 'third_party/cld/*' \ - \! -path 'third_party/ffmpeg/*' \ - \! -path 'third_party/flac/flac.h' \ - \! -path 'third_party/gpsd/*' \ - \! -path 'third_party/harfbuzz/*' \ - \! -path 'third_party/hunspell/*' \ - \! -path 'third_party/hyphen/*' \ - \! -path 'third_party/iccjpeg/*' \ - \! -path 'third_party/jsoncpp/*' \ - \! -path 'third_party/khronos/*' \ - \! -path 'third_party/launchpad_translations/*' \ - \! -path 'third_party/leveldatabase/*' \ - \! -path 'third_party/libjingle/*' \ - \! -path 'third_party/libphonenumber/*' \ - \! -path 'third_party/libsrtp/*' \ - \! -path 'third_party/libusb/libusb.h' \ - \! -path 'third_party/libva/*' \ - \! -path 'third_party/libvpx/*' \ - \! -path 'third_party/libxml/chromium/*' \ - \! -path 'third_party/libXNVCtrl/*' \ - \! -path 'third_party/libyuv/*' \ - \! -path 'third_party/lss/*' \ - \! -path 'third_party/mesa/*' \ - \! -path 'third_party/modp_b64/*' \ - \! -path 'third_party/mongoose/*' \ - \! -path 'third_party/npapi/*' \ - \! -path 'third_party/openmax/*' \ - \! -path 'third_party/ots/*' \ - \! -path 'third_party/protobuf/*' \ - \! -path 'third_party/qcms/*' \ - \! -path 'third_party/re2/*' \ - \! -path 'third_party/scons-2.0.1/*' \ - \! -path 'third_party/sfntly/*' \ - \! -path 'third_party/skia/*' \ - \! -path 'third_party/smhasher/*' \ - \! -path 'third_party/speex/speex.h' \ - \! -path 'third_party/sqlite/*' \ - \! -path 'third_party/tlslite/*' \ - \! -path 'third_party/trace-viewer/*' \ - \! -path 'third_party/undoview/*' \ - \! -path 'third_party/v8-i18n/*' \ - \! -path 'third_party/webdriver/*' \ - \! -path 'third_party/webgl_conformance/*' \ - \! -path 'third_party/webrtc/*' \ - \! -path 'third_party/zlib/*' \ - -delete || die - - local v8_bundled="$(chromium_bundled_v8_version)" - local v8_installed="$(chromium_installed_v8_version)" - einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}" - - # Remove bundled v8. - find v8 -type f \! -iname '*.gyp*' -delete || die - - # The implementation files include v8 headers with full path, - # like #include "v8/include/v8.h". Make sure the system headers - # will be used. - # TODO: find a solution that can be upstreamed. - rmdir v8/include || die - ln -s /usr/include v8/include || die - - # Make sure the build system will use the right python, bug #344367. - # Only convert directories that need it, to save time. - python_convert_shebangs -q -r 2 build tools -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Disable tcmalloc, it causes problems with e.g. NVIDIA - # drivers, bug #413637. - myconf+=" -Dlinux_use_tcmalloc=0" - - # Disable glibc Native Client toolchain, we don't need it (bug #417019). - myconf+=" -Ddisable_glibc=1" - - # Make it possible to remove third_party/adobe. - echo > "${T}/flapper_version.h" || die - myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" - - # Use system-provided libraries. - # TODO: use_system_ffmpeg - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - # TODO: use_system_vpx - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_flac=1 - -Duse_system_icu=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libusb=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_speex=1 - -Duse_system_v8=1 - -Duse_system_xdg_utils=1 - -Duse_system_yasm=1 - -Duse_system_zlib=0" - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf+=" - $(gyp_use cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use kerberos) - $(gyp_use pulseaudio) - $(gyp_use selinux selinux)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf+=" - -Dlinux_link_gsettings=1" - - if ! use selinux; then - # Enable SUID sandbox. - myconf+=" - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox - -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - myconf+=" - -Dlinux_use_gold_binary=0 - -Dlinux_use_gold_flags=0" - - if ! use bindist; then - # Enable H.624 support in bundled ffmpeg. - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" - fi - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - myconf+=" -Dtarget_arch=x64" - elif [[ $myarch = x86 ]] ; then - myconf+=" -Dtarget_arch=ia32" - else - die "Failed to determine target arch, got '$myarch'." - fi - - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. - myconf+=" -Dwerror=" - - # Avoid CFLAGS problems, bug #352457, bug #390147. - if ! use custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - fi - - egyp_chromium ${myconf} || die -} - -src_compile() { - local test_targets - for x in base cacheinvalidation crypto \ - googleurl gpu media net printing sql; do - test_targets+=" ${x}_unittests" - done - - local make_targets="chrome chromedriver" - if ! use selinux; then - make_targets+=" chrome_sandbox" - fi - if use test; then - make_targets+=$test_targets - fi - - # See bug #410883 for more info about the .host mess. - emake ${make_targets} BUILDTYPE=Release V=1 \ - CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \ - CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \ - LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \ - AR.host="$(tc-getAR)" || die - - pax-mark m out/Release/chrome - if use test; then - for x in $test_targets; do - pax-mark m out/Release/${x} - done - fi -} - -src_test() { - # For more info see bug #350349. - local mylocale='en_US.utf8' - if ! locale -a | grep -q "$mylocale"; then - eerror "${PN} requires ${mylocale} locale for tests" - eerror "Please read the following guides for more information:" - eerror " http://www.gentoo.org/doc/en/guide-localization.xml" - eerror " http://www.gentoo.org/doc/en/utf-8.xml" - die "locale ${mylocale} is not supported" - fi - - # For more info see bug #370957. - if [[ $UID -eq 0 ]]; then - die "Tests must be run as non-root. Please use FEATURES=userpriv." - fi - - runtest() { - local cmd=$1 - shift - local filter="--gtest_filter=$(IFS=:; echo "-${*}")" - einfo "${cmd}" "${filter}" - LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}" - } - - local excluded_base_unittests=( - "ICUStringConversionsTest.*" # bug #350347 - "MessagePumpLibeventTest.*" # bug #398591 - ) - runtest out/Release/base_unittests "${excluded_base_unittests[@]}" - - runtest out/Release/cacheinvalidation_unittests - runtest out/Release/crypto_unittests - runtest out/Release/googleurl_unittests - runtest out/Release/gpu_unittests - - local excluded_media_unittests=( - "ChunkDemuxerTest.TestDurationChangeTimestampOffset" # bug #431042 - ) - runtest out/Release/media_unittests "${excluded_media_unittests[@]}" - - local excluded_net_unittests=( - "NetUtilTest.IDNToUnicode*" # bug 361885 - "NetUtilTest.FormatUrl*" # see above - "DnsConfigServiceTest.GetSystemConfig" # bug #394883 - "CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269 - "URLFetcher*" # bug #425764 - "SpdyFramer*" # bug #436370 - ) - runtest out/Release/net_unittests "${excluded_net_unittests[@]}" - - runtest out/Release/printing_unittests - runtest out/Release/sql_unittests -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome || die - - if ! use selinux; then - doexe out/Release/chrome_sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - fi - - doexe out/Release/chromedriver || die - - doexe out/Release/nacl_helper{,_bootstrap} || die - insinto "${CHROMIUM_HOME}" - doins out/Release/nacl_irt_*.nexe || die - doins out/Release/libppGoogleNaClPluginChrome.so || die - - newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - fi - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die - - # Allow users to override command-line options, bug #357629. - dodir /etc/chromium || die - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" || die - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.pak || die - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die - newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die - - doexe out/Release/libffmpegsumo.so || die - - # Install icons and desktop entry. - local branding size - for size in 16 22 24 32 48 64 128 256 ; do - case ${size} in - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; - *) branding="chrome/app/theme/chromium" ;; - esac - newicon -s ${size} "${branding}/product_logo_${size}.png" \ - chromium-browser${CHROMIUM_SUFFIX}.png - done - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - mime_types+="x-scheme-handler/ftp;" # bug #412185 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 - make_desktop_entry \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Chromium${CHROMIUM_SUFFIX}" \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=chromium-browser" - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die - - # Install GNOME default application entry (bug #303100). - if use gnome; then - dodir /usr/share/gnome-control-center/default-apps || die - insinto /usr/share/gnome-control-center/default-apps - newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ - "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml - fi - fi -} diff --git a/www-client/chromium/chromium-23.0.1271.40.ebuild b/www-client/chromium/chromium-23.0.1271.40.ebuild deleted file mode 100644 index 2247ec246fce..000000000000 --- a/www-client/chromium/chromium-23.0.1271.40.ebuild +++ /dev/null @@ -1,502 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1271.40.ebuild,v 1.1 2012/10/17 22:24:18 floppym Exp $ - -EAPI="4" -PYTHON_DEPEND="2:2.6" - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr - sv sw ta te th tr uk vi zh_CN zh_TW" - -inherit chromium eutils flag-o-matic multilib \ - pax-utils portability python toolchain-funcs versionator virtualx - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc" - -RDEPEND="app-arch/bzip2 - cups? ( - dev-libs/libgcrypt - >=net-print/cups-1.3.11 - ) - >=dev-lang/v8-3.11.10.6 - >=dev-libs/elfutils-0.149 - dev-libs/expat - >=dev-libs/icu-49.1.1-r1 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2[icu] - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - gnome? ( >=gnome-base/gconf-2.24.0 ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) - >=media-libs/alsa-lib-1.0.19 - media-libs/flac - >=media-libs/libjpeg-turbo-1.2.0-r1 - media-libs/libpng - >=media-libs/libwebp-0.2.0_rc1 - media-libs/speex - pulseaudio? ( media-sound/pulseaudio ) - sys-apps/dbus - sys-fs/udev - virtual/libusb:1 - x11-libs/gtk+:2 - x11-libs/libXinerama - x11-libs/libXScrnSaver - x11-libs/libXtst - kerberos? ( virtual/krb5 ) - selinux? ( - sec-policy/selinux-chromium - sys-libs/libselinux - )" -DEPEND="${RDEPEND} - >=dev-lang/nacl-toolchain-newlib-0_p9093 - dev-lang/perl - dev-lang/yasm - dev-python/ply - dev-python/simplejson - >=dev-util/gperf-3.0.3 - >=sys-devel/bison-2.4.3 - sys-devel/flex - >=sys-devel/make-3.81-r2 - virtual/pkgconfig - test? ( dev-python/pyftpdlib )" -RDEPEND+=" - !=www-client/chromium-9999 - x11-misc/xdg-utils - virtual/ttf-fonts" - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -pkg_setup() { - if [[ "${SLOT}" == "0" ]]; then - CHROMIUM_SUFFIX="" - else - CHROMIUM_SUFFIX="-${SLOT}" - fi - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - - # Make sure the build system will use the right python, bug #344367. - python_set_active_version 2 - python_pkg_setup - - if ! use selinux; then - chromium_suid_sandbox_check_kernel_config - fi - - if use bindist; then - elog "bindist enabled: H.264 video support will be disabled." - else - elog "bindist disabled: Resulting binaries may not be legal to re-distribute." - fi -} - -src_prepare() { - if ! use arm; then - ebegin "Preparing NaCl newlib toolchain" - pushd "${T}" >/dev/null || die - mkdir sdk || die - cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die - mkdir -p "${S}"/native_client/toolchain/.tars || die - tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die - popd >/dev/null || die - eend $? - fi - - # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371. - # sed -i '1i#define OF(x) x' \ - # third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die - - # Fix build without NaCl glibc toolchain. - epatch "${FILESDIR}/${PN}-ppapi-r0.patch" - - # Fix unnecessary dependency on dbus-glib, bug #434346. - epatch "${FILESDIR}/${PN}-dbus-glib-r0.patch" - - # Fix build with system ICU. - epatch "${FILESDIR}/${PN}-system-icu-r0.patch" - - # Fix build with system speex, bug #432748. - epatch "${FILESDIR}/${PN}-system-speex-r0.patch" - - # Missing gyp files in tarball. - # https://code.google.com/p/chromium/issues/detail?id=144823 - if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then - die "tarball fixed, please remove workaround" - fi - - mkdir -p chrome/test/data/nacl - cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF - { - 'targets': [ - { - 'target_name': 'nacl_tests', - 'type': 'none', - }, - ], - } - EOF - - epatch_user - - # Remove most bundled libraries. Some are still needed. - find third_party -type f \! -iname '*.gyp*' \ - \! -path 'third_party/WebKit/*' \ - \! -path 'third_party/angle/*' \ - \! -path 'third_party/cacheinvalidation/*' \ - \! -path 'third_party/cld/*' \ - \! -path 'third_party/ffmpeg/*' \ - \! -path 'third_party/flac/flac.h' \ - \! -path 'third_party/flot/*' \ - \! -path 'third_party/gpsd/*' \ - \! -path 'third_party/harfbuzz/*' \ - \! -path 'third_party/hunspell/*' \ - \! -path 'third_party/hyphen/*' \ - \! -path 'third_party/iccjpeg/*' \ - \! -path 'third_party/jsoncpp/*' \ - \! -path 'third_party/khronos/*' \ - \! -path 'third_party/launchpad_translations/*' \ - \! -path 'third_party/leveldatabase/*' \ - \! -path 'third_party/libjingle/*' \ - \! -path 'third_party/libphonenumber/*' \ - \! -path 'third_party/libsrtp/*' \ - \! -path 'third_party/libusb/libusb.h' \ - \! -path 'third_party/libva/*' \ - \! -path 'third_party/libvpx/*' \ - \! -path 'third_party/libxml/chromium/*' \ - \! -path 'third_party/libXNVCtrl/*' \ - \! -path 'third_party/libyuv/*' \ - \! -path 'third_party/lss/*' \ - \! -path 'third_party/mesa/*' \ - \! -path 'third_party/modp_b64/*' \ - \! -path 'third_party/mongoose/*' \ - \! -path 'third_party/mt19937ar/*' \ - \! -path 'third_party/npapi/*' \ - \! -path 'third_party/openmax/*' \ - \! -path 'third_party/ots/*' \ - \! -path 'third_party/protobuf/*' \ - \! -path 'third_party/qcms/*' \ - \! -path 'third_party/re2/*' \ - \! -path 'third_party/scons-2.0.1/*' \ - \! -path 'third_party/sfntly/*' \ - \! -path 'third_party/skia/*' \ - \! -path 'third_party/smhasher/*' \ - \! -path 'third_party/speex/speex.h' \ - \! -path 'third_party/sqlite/*' \ - \! -path 'third_party/tcmalloc/*' \ - \! -path 'third_party/tlslite/*' \ - \! -path 'third_party/trace-viewer/*' \ - \! -path 'third_party/undoview/*' \ - \! -path 'third_party/v8-i18n/*' \ - \! -path 'third_party/webdriver/*' \ - \! -path 'third_party/webgl_conformance/*' \ - \! -path 'third_party/webrtc/*' \ - \! -path 'third_party/zlib/*' \ - -delete || die - - local v8_bundled="$(chromium_bundled_v8_version)" - local v8_installed="$(chromium_installed_v8_version)" - einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}" - - # Remove bundled v8. - find v8 -type f \! -iname '*.gyp*' -delete || die - - # The implementation files include v8 headers with full path, - # like #include "v8/include/v8.h". Make sure the system headers - # will be used. - # TODO: find a solution that can be upstreamed. - rmdir v8/include || die - ln -s /usr/include v8/include || die - - # Make sure the build system will use the right python, bug #344367. - # Only convert directories that need it, to save time. - python_convert_shebangs -q -r 2 build tools -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Optional tcmalloc. Note it causes problems with e.g. NVIDIA - # drivers, bug #413637. - myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)" - - # Disable glibc Native Client toolchain, we don't need it (bug #417019). - myconf+=" -Ddisable_glibc=1" - - # TODO: also build with pnacl - myconf+=" -Ddisable_pnacl=1" - - # Make it possible to remove third_party/adobe. - echo > "${T}/flapper_version.h" || die - myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" - - # Use system-provided libraries. - # TODO: use_system_ffmpeg - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_speex (needs additional shims, bug #432748). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - # TODO: use_system_vpx - # TODO: use_system_zlib (forked, bug #432746). - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_flac=1 - -Duse_system_icu=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libusb=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_speex=1 - -Duse_system_v8=1 - -Duse_system_xdg_utils=1 - -Duse_system_yasm=1 - -Duse_system_zlib=0" - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf+=" - $(gyp_use cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use kerberos) - $(gyp_use pulseaudio) - $(gyp_use selinux selinux)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf+=" - -Dlinux_link_gsettings=1" - - if ! use selinux; then - # Enable SUID sandbox. - myconf+=" - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox - -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - myconf+=" - -Dlinux_use_gold_binary=0 - -Dlinux_use_gold_flags=0" - - if ! use bindist; then - # Enable H.624 support in bundled ffmpeg. - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" - fi - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - myconf+=" -Dtarget_arch=x64" - elif [[ $myarch = x86 ]] ; then - myconf+=" -Dtarget_arch=ia32" - elif [[ $myarch = arm ]] ; then - # TODO: re-enable NaCl (NativeClient). - myconf+=" -Dtarget_arch=arm - -Darm_neon=0 - -Ddisable_nacl=1" - else - die "Failed to determine target arch, got '$myarch'." - fi - - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. - myconf+=" -Dwerror=" - - # Avoid CFLAGS problems, bug #352457, bug #390147. - if ! use custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - fi - - egyp_chromium ${myconf} || die -} - -src_compile() { - local test_targets - for x in base cacheinvalidation crypto \ - googleurl gpu media net printing sql; do - test_targets+=" ${x}_unittests" - done - - local make_targets="chrome chromedriver" - if ! use selinux; then - make_targets+=" chrome_sandbox" - fi - if use test; then - make_targets+=$test_targets - fi - - # See bug #410883 for more info about the .host mess. - emake ${make_targets} BUILDTYPE=Release V=1 \ - CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \ - CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \ - LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \ - AR.host="$(tc-getAR)" || die - - pax-mark m out/Release/chrome - if use test; then - for x in $test_targets; do - pax-mark m out/Release/${x} - done - fi -} - -src_test() { - # For more info see bug #350349. - local mylocale='en_US.utf8' - if ! locale -a | grep -q "$mylocale"; then - eerror "${PN} requires ${mylocale} locale for tests" - eerror "Please read the following guides for more information:" - eerror " http://www.gentoo.org/doc/en/guide-localization.xml" - eerror " http://www.gentoo.org/doc/en/utf-8.xml" - die "locale ${mylocale} is not supported" - fi - - # For more info see bug #370957. - if [[ $UID -eq 0 ]]; then - die "Tests must be run as non-root. Please use FEATURES=userpriv." - fi - - runtest() { - local cmd=$1 - shift - local filter="--gtest_filter=$(IFS=:; echo "-${*}")" - einfo "${cmd}" "${filter}" - LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}" - } - - local excluded_base_unittests=( - "ICUStringConversionsTest.*" # bug #350347 - "MessagePumpLibeventTest.*" # bug #398591 - ) - runtest out/Release/base_unittests "${excluded_base_unittests[@]}" - - runtest out/Release/cacheinvalidation_unittests - runtest out/Release/crypto_unittests - runtest out/Release/googleurl_unittests - runtest out/Release/gpu_unittests - runtest out/Release/media_unittests - - local excluded_net_unittests=( - "NetUtilTest.IDNToUnicode*" # bug 361885 - "NetUtilTest.FormatUrl*" # see above - "DnsConfigServiceTest.GetSystemConfig" # bug #394883 - "CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269 - "URLFetcher*" # bug #425764 - "HTTPSOCSPTest.*" # bug #426630 - "HTTPSEVCRLSetTest.*" # see above - "HTTPSCRLSetTest.*" # see above - ) - runtest out/Release/net_unittests "${excluded_net_unittests[@]}" - - runtest out/Release/printing_unittests - runtest out/Release/sql_unittests -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome || die - - if ! use selinux; then - doexe out/Release/chrome_sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - fi - - doexe out/Release/chromedriver || die - - if ! use arm; then - doexe out/Release/nacl_helper{,_bootstrap} || die - insinto "${CHROMIUM_HOME}" - doins out/Release/nacl_irt_*.nexe || die - doins out/Release/libppGoogleNaClPluginChrome.so || die - fi - - newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - fi - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die - - # Allow users to override command-line options, bug #357629. - dodir /etc/chromium || die - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" || die - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.pak || die - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die - newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die - - doexe out/Release/libffmpegsumo.so || die - - # Install icons and desktop entry. - local branding size - for size in 16 22 24 32 48 64 128 256 ; do - case ${size} in - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; - *) branding="chrome/app/theme/chromium" ;; - esac - newicon -s ${size} "${branding}/product_logo_${size}.png" \ - chromium-browser${CHROMIUM_SUFFIX}.png - done - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - mime_types+="x-scheme-handler/ftp;" # bug #412185 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 - make_desktop_entry \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Chromium${CHROMIUM_SUFFIX}" \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=chromium-browser" - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die - - # Install GNOME default application entry (bug #303100). - if use gnome; then - dodir /usr/share/gnome-control-center/default-apps || die - insinto /usr/share/gnome-control-center/default-apps - newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ - "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml - fi - fi -} diff --git a/www-client/chromium/chromium-23.0.1271.60.ebuild b/www-client/chromium/chromium-23.0.1271.60.ebuild deleted file mode 100644 index 6c7adbf732e9..000000000000 --- a/www-client/chromium/chromium-23.0.1271.60.ebuild +++ /dev/null @@ -1,502 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1271.60.ebuild,v 1.1 2012/10/31 21:34:31 floppym Exp $ - -EAPI="4" -PYTHON_DEPEND="2:2.6" - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr - sv sw ta te th tr uk vi zh_CN zh_TW" - -inherit chromium eutils flag-o-matic multilib \ - pax-utils portability python toolchain-funcs versionator virtualx - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc" - -RDEPEND="app-arch/bzip2 - cups? ( - dev-libs/libgcrypt - >=net-print/cups-1.3.11 - ) - >=dev-lang/v8-3.11.10.6 - >=dev-libs/elfutils-0.149 - dev-libs/expat - >=dev-libs/icu-49.1.1-r1 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2[icu] - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - gnome? ( >=gnome-base/gconf-2.24.0 ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) - >=media-libs/alsa-lib-1.0.19 - media-libs/flac - >=media-libs/libjpeg-turbo-1.2.0-r1 - media-libs/libpng - >=media-libs/libwebp-0.2.0_rc1 - media-libs/speex - pulseaudio? ( media-sound/pulseaudio ) - sys-apps/dbus - sys-fs/udev - virtual/libusb:1 - x11-libs/gtk+:2 - x11-libs/libXinerama - x11-libs/libXScrnSaver - x11-libs/libXtst - kerberos? ( virtual/krb5 ) - selinux? ( - sec-policy/selinux-chromium - sys-libs/libselinux - )" -DEPEND="${RDEPEND} - >=dev-lang/nacl-toolchain-newlib-0_p9093 - dev-lang/perl - dev-lang/yasm - dev-python/ply - dev-python/simplejson - >=dev-util/gperf-3.0.3 - >=sys-devel/bison-2.4.3 - sys-devel/flex - >=sys-devel/make-3.81-r2 - virtual/pkgconfig - test? ( dev-python/pyftpdlib )" -RDEPEND+=" - !=www-client/chromium-9999 - x11-misc/xdg-utils - virtual/ttf-fonts" - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -pkg_setup() { - if [[ "${SLOT}" == "0" ]]; then - CHROMIUM_SUFFIX="" - else - CHROMIUM_SUFFIX="-${SLOT}" - fi - CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}" - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX RANLIB - - # Make sure the build system will use the right python, bug #344367. - python_set_active_version 2 - python_pkg_setup - - if ! use selinux; then - chromium_suid_sandbox_check_kernel_config - fi - - if use bindist; then - elog "bindist enabled: H.264 video support will be disabled." - else - elog "bindist disabled: Resulting binaries may not be legal to re-distribute." - fi -} - -src_prepare() { - if ! use arm; then - ebegin "Preparing NaCl newlib toolchain" - pushd "${T}" >/dev/null || die - mkdir sdk || die - cp -a /usr/$(get_libdir)/nacl-toolchain-newlib sdk/nacl-sdk || die - mkdir -p "${S}"/native_client/toolchain/.tars || die - tar czf "${S}"/native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk || die - popd >/dev/null || die - eend $? - fi - - # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371. - # sed -i '1i#define OF(x) x' \ - # third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die - - # Fix build without NaCl glibc toolchain. - epatch "${FILESDIR}/${PN}-ppapi-r0.patch" - - # Fix unnecessary dependency on dbus-glib, bug #434346. - epatch "${FILESDIR}/${PN}-dbus-glib-r0.patch" - - # Fix build with system ICU. - epatch "${FILESDIR}/${PN}-system-icu-r0.patch" - - # Fix build with system speex, bug #432748. - epatch "${FILESDIR}/${PN}-system-speex-r0.patch" - - # Missing gyp files in tarball. - # https://code.google.com/p/chromium/issues/detail?id=144823 - if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then - die "tarball fixed, please remove workaround" - fi - - mkdir -p chrome/test/data/nacl - cat > chrome/test/data/nacl/nacl_test_data.gyp <<-EOF - { - 'targets': [ - { - 'target_name': 'nacl_tests', - 'type': 'none', - }, - ], - } - EOF - - epatch_user - - # Remove most bundled libraries. Some are still needed. - find third_party -type f \! -iname '*.gyp*' \ - \! -path 'third_party/WebKit/*' \ - \! -path 'third_party/angle/*' \ - \! -path 'third_party/cacheinvalidation/*' \ - \! -path 'third_party/cld/*' \ - \! -path 'third_party/ffmpeg/*' \ - \! -path 'third_party/flac/flac.h' \ - \! -path 'third_party/flot/*' \ - \! -path 'third_party/gpsd/*' \ - \! -path 'third_party/harfbuzz/*' \ - \! -path 'third_party/hunspell/*' \ - \! -path 'third_party/hyphen/*' \ - \! -path 'third_party/iccjpeg/*' \ - \! -path 'third_party/jsoncpp/*' \ - \! -path 'third_party/khronos/*' \ - \! -path 'third_party/launchpad_translations/*' \ - \! -path 'third_party/leveldatabase/*' \ - \! -path 'third_party/libjingle/*' \ - \! -path 'third_party/libphonenumber/*' \ - \! -path 'third_party/libsrtp/*' \ - \! -path 'third_party/libusb/libusb.h' \ - \! -path 'third_party/libva/*' \ - \! -path 'third_party/libvpx/*' \ - \! -path 'third_party/libxml/chromium/*' \ - \! -path 'third_party/libXNVCtrl/*' \ - \! -path 'third_party/libyuv/*' \ - \! -path 'third_party/lss/*' \ - \! -path 'third_party/mesa/*' \ - \! -path 'third_party/modp_b64/*' \ - \! -path 'third_party/mongoose/*' \ - \! -path 'third_party/mt19937ar/*' \ - \! -path 'third_party/npapi/*' \ - \! -path 'third_party/openmax/*' \ - \! -path 'third_party/ots/*' \ - \! -path 'third_party/protobuf/*' \ - \! -path 'third_party/qcms/*' \ - \! -path 'third_party/re2/*' \ - \! -path 'third_party/scons-2.0.1/*' \ - \! -path 'third_party/sfntly/*' \ - \! -path 'third_party/skia/*' \ - \! -path 'third_party/smhasher/*' \ - \! -path 'third_party/speex/speex.h' \ - \! -path 'third_party/sqlite/*' \ - \! -path 'third_party/tcmalloc/*' \ - \! -path 'third_party/tlslite/*' \ - \! -path 'third_party/trace-viewer/*' \ - \! -path 'third_party/undoview/*' \ - \! -path 'third_party/v8-i18n/*' \ - \! -path 'third_party/webdriver/*' \ - \! -path 'third_party/webgl_conformance/*' \ - \! -path 'third_party/webrtc/*' \ - \! -path 'third_party/zlib/*' \ - -delete || die - - local v8_bundled="$(chromium_bundled_v8_version)" - local v8_installed="$(chromium_installed_v8_version)" - einfo "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}" - - # Remove bundled v8. - find v8 -type f \! -iname '*.gyp*' -delete || die - - # The implementation files include v8 headers with full path, - # like #include "v8/include/v8.h". Make sure the system headers - # will be used. - # TODO: find a solution that can be upstreamed. - rmdir v8/include || die - ln -s /usr/include v8/include || die - - # Make sure the build system will use the right python, bug #344367. - # Only convert directories that need it, to save time. - python_convert_shebangs -q -r 2 build tools -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Optional tcmalloc. Note it causes problems with e.g. NVIDIA - # drivers, bug #413637. - myconf+=" $(gyp_use tcmalloc linux_use_tcmalloc)" - - # Disable glibc Native Client toolchain, we don't need it (bug #417019). - myconf+=" -Ddisable_glibc=1" - - # TODO: also build with pnacl - myconf+=" -Ddisable_pnacl=1" - - # Make it possible to remove third_party/adobe. - echo > "${T}/flapper_version.h" || die - myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" - - # Use system-provided libraries. - # TODO: use_system_ffmpeg - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_speex (needs additional shims, bug #432748). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - # TODO: use_system_vpx - # TODO: use_system_zlib (forked, bug #432746). - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_flac=1 - -Duse_system_icu=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libusb=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_speex=1 - -Duse_system_v8=1 - -Duse_system_xdg_utils=1 - -Duse_system_yasm=1 - -Duse_system_zlib=0" - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf+=" - $(gyp_use cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use kerberos) - $(gyp_use pulseaudio) - $(gyp_use selinux selinux)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf+=" - -Dlinux_link_gsettings=1" - - if ! use selinux; then - # Enable SUID sandbox. - myconf+=" - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox - -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - myconf+=" - -Dlinux_use_gold_binary=0 - -Dlinux_use_gold_flags=0" - - if ! use bindist; then - # Enable H.624 support in bundled ffmpeg. - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome" - fi - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - myconf+=" -Dtarget_arch=x64" - elif [[ $myarch = x86 ]] ; then - myconf+=" -Dtarget_arch=ia32" - elif [[ $myarch = arm ]] ; then - # TODO: re-enable NaCl (NativeClient). - myconf+=" -Dtarget_arch=arm - -Darm_neon=0 - -Ddisable_nacl=1" - else - die "Failed to determine target arch, got '$myarch'." - fi - - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. - myconf+=" -Dwerror=" - - # Avoid CFLAGS problems, bug #352457, bug #390147. - if ! use custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - fi - - egyp_chromium ${myconf} || die -} - -src_compile() { - local test_targets - for x in base cacheinvalidation crypto \ - googleurl gpu media net printing sql; do - test_targets+=" ${x}_unittests" - done - - local make_targets="chrome chromedriver" - if ! use selinux; then - make_targets+=" chrome_sandbox" - fi - if use test; then - make_targets+=$test_targets - fi - - # See bug #410883 for more info about the .host mess. - emake ${make_targets} BUILDTYPE=Release V=1 \ - CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \ - CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \ - LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \ - AR.host="$(tc-getAR)" || die - - pax-mark m out/Release/chrome - if use test; then - for x in $test_targets; do - pax-mark m out/Release/${x} - done - fi -} - -src_test() { - # For more info see bug #350349. - local mylocale='en_US.utf8' - if ! locale -a | grep -q "$mylocale"; then - eerror "${PN} requires ${mylocale} locale for tests" - eerror "Please read the following guides for more information:" - eerror " http://www.gentoo.org/doc/en/guide-localization.xml" - eerror " http://www.gentoo.org/doc/en/utf-8.xml" - die "locale ${mylocale} is not supported" - fi - - # For more info see bug #370957. - if [[ $UID -eq 0 ]]; then - die "Tests must be run as non-root. Please use FEATURES=userpriv." - fi - - runtest() { - local cmd=$1 - shift - local filter="--gtest_filter=$(IFS=:; echo "-${*}")" - einfo "${cmd}" "${filter}" - LC_ALL="${mylocale}" VIRTUALX_COMMAND="${cmd}" virtualmake "${filter}" - } - - local excluded_base_unittests=( - "ICUStringConversionsTest.*" # bug #350347 - "MessagePumpLibeventTest.*" # bug #398591 - ) - runtest out/Release/base_unittests "${excluded_base_unittests[@]}" - - runtest out/Release/cacheinvalidation_unittests - runtest out/Release/crypto_unittests - runtest out/Release/googleurl_unittests - runtest out/Release/gpu_unittests - runtest out/Release/media_unittests - - local excluded_net_unittests=( - "NetUtilTest.IDNToUnicode*" # bug 361885 - "NetUtilTest.FormatUrl*" # see above - "DnsConfigServiceTest.GetSystemConfig" # bug #394883 - "CertDatabaseNSSTest.ImportServerCert_SelfSigned" # bug #399269 - "URLFetcher*" # bug #425764 - "HTTPSOCSPTest.*" # bug #426630 - "HTTPSEVCRLSetTest.*" # see above - "HTTPSCRLSetTest.*" # see above - ) - runtest out/Release/net_unittests "${excluded_net_unittests[@]}" - - runtest out/Release/printing_unittests - runtest out/Release/sql_unittests -} - -src_install() { - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome || die - - if ! use selinux; then - doexe out/Release/chrome_sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" - fi - - doexe out/Release/chromedriver || die - - if ! use arm; then - doexe out/Release/nacl_helper{,_bootstrap} || die - insinto "${CHROMIUM_HOME}" - doins out/Release/nacl_irt_*.nexe || die - doins out/Release/libppGoogleNaClPluginChrome.so || die - fi - - newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \ - -i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die - fi - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die - - # Allow users to override command-line options, bug #357629. - dodir /etc/chromium || die - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" || die - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.pak || die - - doins -r out/Release/locales || die - doins -r out/Release/resources || die - - newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die - newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die - - doexe out/Release/libffmpegsumo.so || die - - # Install icons and desktop entry. - local branding size - for size in 16 22 24 32 48 64 128 256 ; do - case ${size} in - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; - *) branding="chrome/app/theme/chromium" ;; - esac - newicon -s ${size} "${branding}/product_logo_${size}.png" \ - chromium-browser${CHROMIUM_SUFFIX}.png - done - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - mime_types+="x-scheme-handler/ftp;" # bug #412185 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 - make_desktop_entry \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Chromium${CHROMIUM_SUFFIX}" \ - chromium-browser${CHROMIUM_SUFFIX} \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=chromium-browser" - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die - - # Install GNOME default application entry (bug #303100). - if use gnome; then - dodir /usr/share/gnome-control-center/default-apps || die - insinto /usr/share/gnome-control-center/default-apps - newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die - if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then - sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \ - "${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml - fi - fi -} diff --git a/www-client/chromium/chromium-23.0.1271.64.ebuild b/www-client/chromium/chromium-23.0.1271.64.ebuild index 78bcc4f2d902..497958f20889 100644 --- a/www-client/chromium/chromium-23.0.1271.64.ebuild +++ b/www-client/chromium/chromium-23.0.1271.64.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1271.64.ebuild,v 1.1 2012/11/07 01:06:23 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1271.64.ebuild,v 1.3 2012/11/07 16:20:24 ago Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -18,7 +18,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}. LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc" RDEPEND="app-arch/bzip2 diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index 845fda075d42..009c5d9f59af 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -4,3 +4,6 @@ DIST opera-12.02-1578.x86_64.linux.tar.xz 13219992 SHA256 e861f14b984898b5a2c0d0 DIST opera-12.10-1652.i386.freebsd.tar.xz 13476352 SHA256 d14b37d74db549573fbdd517df6da0e8b02630c7c1de1aaa7f2e75cbf558ae78 SHA512 2bc56608eaade3700ce0f95c205e6a5bb6a29278594ce2b7828d93dc5ccbd93ff84ee465788f39018d59efe403d5ab4428169332bb0172c3caf3fddf6a62d6e4 WHIRLPOOL 486a3be56c15ec80169e4719ab857e5d559aee2d59690120c3f8152fa5b1df46780a9bf6cb6dc23357b5fba49e75cae50f6ecb4ebd284b7c8157595e34325fbc DIST opera-12.10-1652.i386.linux.tar.xz 13514036 SHA256 e7a099b0ca20307e7682fdec4aaec4bd2856cf1d3ae75e1da67b76cfda5fe619 SHA512 095ed0e96dc39e922ce03599a37987307b273dae45b1e64e207c1d4d60335921c7265a659cfd438b3dec4b785e6c299e6acba0451cbb51df04a94618ee339a48 WHIRLPOOL cba61174d626a44d80ee21791b6840d0c55d76a7717c6e32fad54aefb468ae7e0a7c73cdc1cedf346e7d30e27a06acd790e820326cb82ec47cb36615a407deb6 DIST opera-12.10-1652.x86_64.linux.tar.xz 13630200 SHA256 d5fc0d8db10fe083a3e1df4c1dac2e983656c2a54bb6352f84be93e61e80ded4 SHA512 6c37c60245bfdbe2d27952ec6b324392946d1d1d337c7e91828af648050f7765bee29ceace3f9725ff8f459808ed743a78856ad4dc633ca1b2d1a5e5754a816b WHIRLPOOL e796aa1c30998ce515b1be23a3056d750883523765d78c23337c31a23cb599ac7bcd59bc0bb3845b8444d15398922b49258c113de9e66dd69e27a4eef9bdfa31 +DIST opera-12.11-1653.i386.freebsd.tar.xz 13475972 SHA256 8ad17594d85f75efc5b8745bd7c9fd4b4825651d1434805ad278740a218e61d5 SHA512 55e46a290dee64f78a5c21cff45f3b0ddb066d4435b2c733ddf67663805193ce17bcfd8e62120074cb78d1c49ddc7aa67289ed1af02f7f3f9acbd4c2b1619b01 WHIRLPOOL 29b4ce1b7ffcd62a7a0c4680889e6e1d22d4a928a81088b6d2b28556241046e5a560eb2dff0cb99273fe5f361ca1301fc4bd3115f1d2292eb5f67e5a067a732f +DIST opera-12.11-1653.i386.linux.tar.xz 13512340 SHA256 24b7d7eb66eae9072f71294ea00437e786d4ee67bdf66e19179b75706e52bdb4 SHA512 13ae53cdac2f759f39c6f69b78ddfafd56215144db4462a8c62d0441fdc9c2d4a25181a6ed3da6d4cae31c3ce211df2db67b1ea76e603d27ce74e70b15220182 WHIRLPOOL d956b5585e113cd8f5475054830d8394b1652c6e8ec6fb02088c80b9b41a56c12a8bb9a2ad294809f10dbe103c0550cfd418f0af31c6279ecddbfe7033263d3e +DIST opera-12.11-1653.x86_64.linux.tar.xz 13647572 SHA256 f2f41ddbca7c9c52564149760f5b40fd4300da26533756d9159de0463f7a2714 SHA512 e3e4081b2ac843e55c687343a8331194dd310224a845662e5ef2599d603c59f902e0e989bc045b25d94c0c4cc2549b28b063436dd7fd33b9a18dd7bf26651992 WHIRLPOOL 0c781e0b2b199ae5416292ca97d752c89cdf0c194cee1ab01f0788c5bdf5b1bb38341c3e4752691c25cdef8097579ade2e7e4aca88cf45d968dc41540c354be3 diff --git a/www-client/opera/opera-12.11.1653.ebuild b/www-client/opera/opera-12.11.1653.ebuild new file mode 100644 index 000000000000..e2aba9d7f7d0 --- /dev/null +++ b/www-client/opera/opera-12.11.1653.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.11.1653.ebuild,v 1.1 2012/11/07 16:08:06 jer Exp $ + +EAPI=4 +inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator + +DESCRIPTION="A fast and secure web browser and Internet suite" +HOMEPAGE="http://www.opera.com/" + +SLOT="0" +LICENSE="OPERA-12 LGPL-2 LGPL-3" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="elibc_FreeBSD gtk kde +gstreamer multilib" + +O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00 +O_B="$(get_version_component_range 3)" # Build version, i.e. 1156 + +O_D="19084_${O_V}-${O_B}" +O_P="${PN}-${O_V}-${O_B}" +O_U="http://snapshot.opera.com/unix/" + +SRC_URI=" + amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz ) + x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz ) + x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz ) +" + +O_LINGUAS=" + af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he + hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk + sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu +" + +for O_LINGUA in ${O_LINGUAS}; do + IUSE+=" linguas_${O_LINGUA/-/_}" +done + +DEPEND=" + >=sys-apps/sed-4 + app-arch/xz-utils +" +GTKRDEPEND=" + dev-libs/atk + dev-libs/glib:2 + x11-libs/cairo + x11-libs/gdk-pixbuf + gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) + x11-libs/pango + x11-libs/pixman +" +KDERDEPEND=" + kde-base/kdelibs + x11-libs/qt-core:4 + x11-libs/qt-gui:4 +" +GSTRDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 + media-libs/gst-plugins-base + media-libs/gstreamer + media-plugins/gst-plugins-meta +" +RDEPEND=" + media-libs/fontconfig + media-libs/freetype + sys-apps/util-linux + sys-libs/zlib + virtual/opengl + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/libXrender + x11-libs/libXt + gtk? ( ${GTKRDEPEND} ) + kde? ( ${KDERDEPEND} ) + gstreamer? ( ${GSTRDEPEND} ) +" +src_unpack() { + unpack ${A} + mv -v ${PN}* "${S}" || die +} + +src_prepare() { + export OPREFIX="/usr/$(get_libdir)" + export QA_FLAGS_IGNORED="${OPREFIX}/${PN}/.*" + export QA_PRESTRIPPED="${OPREFIX}/${PN}/.*" + + local LNGDIR="share/${PN}/locale" + + # Count linguas + count() { echo ${#}; } + local lingua_count=$(count ${O_LINGUAS} en) + local locale_count=$(count ${LNGDIR}/*) + [[ ${lingua_count} = ${locale_count} ]] \ + || die "Number of LINGUAS does not match number of locales" + unset count + + # Remove unwanted linguas + for LINGUA in ${O_LINGUAS}; do + if ! use linguas_${LINGUA/-/_}; then + LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-}) + rm -r "${LINGUA}" || die "The list of linguas needs to be fixed" + fi + done + + # Remove doc directory but keep the LICENSE under another name (bug #315473) + mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt + rm -rf share/doc + for locale in share/${PN}/locale/*; do + rm -f "${locale}/license.txt" + ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \ + || die + done + + # Remove package directory + rm -rf share/${PN}/package + + # Optional libraries + if ! use gtk; then + rm lib/${PN}/liboperagtk2.so || die + rm lib/${PN}/liboperagtk3.so || die + fi + if ! use kde; then + rm lib/${PN}/liboperakde4.so || die + fi + if ! use gstreamer; then + rm -r lib/${PN}/gstreamer || die + fi + if use amd64 && ! use multilib; then + rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die + fi + + # Unzip the man pages before sedding + gunzip share/man/man1/* || die + + local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX= + if [[ ${PN} = opera-next ]]; then + OPERA_SUFFIX="-next" + OPERA__SUFFIX=" Next" + OPERA_USUFFIX="-NEXT" + fi + + # Replace PREFIX, SUFFIX and PN in various files + sed -i \ + -e "s:@@{PREFIX}:/usr:g" \ + -e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \ + -e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \ + -e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \ + share/man/man1/* \ + share/mime/packages/* \ + share/applications/${PN}-*.desktop \ + || die + + # Create /usr/bin/opera wrapper + echo '#!/bin/sh' > ${PN} + echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN} + echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \ + >> ${PN} + echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN} + + # Change libz.so.3 to libz.so.1 for gentoo/freebsd + if use elibc_FreeBSD; then + scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \ + while read i; do + if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]]; + then + export SANITY_CHECK_LIBZ_FAILED=1 + break + fi + sed -i \ + "$i" \ + -e 's/libz\.so\.3/libz.so.1/g' + done + [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die + fi +} + +src_install() { + # We install into usr instead of opt as Opera does not support the latter + dodir /usr + mv lib/ "${D}/${OPREFIX}" || die + mv share/ "${D}/usr/" || die + + # Install startup scripts + dobin ${PN} + + # Stop revdep-rebuild from checking opera binaries + dodir /etc/revdep-rebuild + echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \ + > "${D}"/etc/revdep-rebuild/90${PN} + + # Set PaX markings for hardened/PaX (bug #344267) + pax-mark m $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) ) +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + if use elibc_FreeBSD; then + elog + elog "To improve shared memory usage please set:" + elog "$ sysctl kern.ipc.shm_allow_removed=1" + fi + + # Update desktop file database and gtk icon cache (bug #334993) + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + # Update desktop file database and gtk icon cache (bug #334993) + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index 81dec2833b6e..c40717c6eef3 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -1,5 +1,3 @@ DIST adobe-flash-10.3.183.43.i386.tar.gz 5460239 SHA256 b6d01187b6e3090cf2e88820c2ca220ebf8ce14e9febed2259d3ac9a963178cf SHA512 7bc243da636226c8773703a6fe994105bc5072ee2f832feda4285c9b22c2c0a5684f7eb26b22e855f5be6112d11b9cd876cce13186c526b1cd66b9cade4485d4 WHIRLPOOL 8e49d1f9619ba3fcf68c097ccb8e8ec7308b6bea14efa164cb90e17ca7621d9bf87b2d12351dbed343861ae2bbbf825edc28cf2d0100cb6d60b530655849b0f9 -DIST adobe-flash-11.2.202.243.i386.tar.gz 6918023 SHA256 c1d35fa76deddf72f4ed91c8fff6482dcc5720066ef4159db62f4cd9c0ca8ebd SHA512 a7699b70320fcf9606f463811c4ba1ae3ac14545b38894f37f94aea0de56299faa02cbccb51a31ca1c9d03b657106904457d3250c4ca5cca24c018463507ddcc WHIRLPOOL c902db6160f1a9e51e0899363c130111fd5ff3b089311514b234b73746ceef9eed72cd7e50c45b27c0db0c1f110fce3d653f04ed16afe53051e4672f9e1890d6 -DIST adobe-flash-11.2.202.243.x86_64.tar.gz 7229949 SHA256 111b1203d0777f594bde095edffe30d025a4b9e1e8af22385ca5e31f4eec265b SHA512 9be6a258b3cff4815d5c363f0c111f63c443f4bf1cf02a09f83ff62de5d3b1273a731f36391d39ca4fb0de861b55942e6d5cc77fa2c285efea882139d9c5ca89 WHIRLPOOL 906d27e42567525ab475f945e36d4b5b9445557efd129e5973a5a4b0315c0b397001dc9f0ccba5507ac332a8e5024cca35245ce380c151e423296b342525fcbe DIST adobe-flash-11.2.202.251.i386.tar.gz 6917347 SHA256 a3362986fe9cba5628c1b1684707de79f63947623b631c2a42eeea15b420f05a SHA512 3f714b397537401ba92d10a76f7185b02896c3d3064653c6aaaf095450c738139280f412dea07650cb219001d443ea102cf3785d11256812f6cb2174ec23ff7a WHIRLPOOL 7b44e7ec191eae349603c9af703b448a4e122aec8e162d3219ec72b1e60143aeca69e5eb23b8e5d4194e64eb389f76ad3814bc140d67f1fd189b8720af2fd6cd DIST adobe-flash-11.2.202.251.x86_64.tar.gz 7228964 SHA256 e267678d480e1f934da738f0e14512bf3adb96425b925c690e62d3882ebe7c5a SHA512 458df3c314bec1dc7cb2af111a7e409b05cbccedb8f98cd8178993f77e55403c54cfc240458cc8916cc34a96c4c782c2a62d8898fc1723ce8475eb71b142f10b WHIRLPOOL 65e081cb8fc03e674646f657ae3b793ee91ca4bfd6a8733abd10509c827615c7635573aa93b47955794c55b202e00ea0c156fe5fbf4552a53a7e0193a1e24bfe diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.243.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.243.ebuild deleted file mode 100644 index a0a5f16c2e88..000000000000 --- a/www-plugins/adobe-flash/adobe-flash-11.2.202.243.ebuild +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.243.ebuild,v 1.4 2012/10/22 08:36:03 ago Exp $ - -EAPI=4 -inherit nsplugins multilib toolchain-funcs versionator - -AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc" -MY_32B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux_i386.tar.gz -> ${P}.i386.tar.gz" -MY_64B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux_x86_64.tar.gz -> ${P}.x86_64.tar.gz" - -DESCRIPTION="Adobe Flash Player" -SRC_URI="x86? ( ${MY_32B_URI} ) -amd64? ( - multilib? ( - 32bit? ( ${MY_32B_URI} ) - 64bit? ( ${MY_64B_URI} ) - ) - !multilib? ( ${MY_64B_URI} ) -)" -HOMEPAGE="http://www.adobe.com/products/flashplayer.html" -IUSE="multilib -32bit +64bit vdpau kde +sse2check" -SLOT="0" - -KEYWORDS="-* amd64 x86" -LICENSE="AdobeFlash-10.3" -RESTRICT="strip mirror" - -S="${WORKDIR}" - -NATIVE_DEPS="x11-libs/gtk+:2 - media-libs/fontconfig - dev-libs/nss - net-misc/curl - vdpau? ( x11-libs/libvdpau ) - kde? ( kde-base/kcmshell ) - >=sys-libs/glibc-2.4" - -EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) - >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 - app-emulation/emul-linux-x86-soundlibs" - -DEPEND="amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )" -RDEPEND="x86? ( $NATIVE_DEPS ) - amd64? ( - multilib? ( - 64bit? ( $NATIVE_DEPS ) - 32bit? ( $EMUL_DEPS ) - ) - !multilib? ( $NATIVE_DEPS ) - ) - || ( media-fonts/liberation-fonts media-fonts/corefonts ) - ${DEPEND}" - -# Where should this all go? (Bug #328639) -INSTALL_BASE="opt/Adobe/flash-player" - -# Ignore QA warnings in these closed-source binaries, since we can't fix them: -QA_PREBUILT="opt/*" - -any_cpu_missing_flag() { - local value=$1 - grep '^flags' /proc/cpuinfo | grep -qv "$value" -} - -pkg_pretend() { - if any_cpu_missing_flag 'sse2'; then - eerror "This version of adobe-flash requires a CPU that supports the" - eerror "SSE2 instruction set, and at least one of your CPUs does not" - eerror "support this feature." - eerror "" - if use sse2check; then - eerror "You should mask this version and use adobe-flash-10.3.* instead." - eerror "To do so, add the following line to your package.mask file:" - eerror " =${CATEGORY}/${P}" - eerror "" - eerror "Or if you are trying to build a binary package for another host" - eerror "that does support SSE2 instructions, you may override this" - eerror "check by setting USE=\"-sse2check\"" - eerror "" - die "${P} requires CPU with SSE2" - else - eerror "Continuing anyway due to USE=\"-sse2check\", but be aware that flash" - eerror "will not function unless all of the CPUs on the system where it" - eerror "is installed support the SSE2 instruction set." - fi - fi -} - -pkg_setup() { - if use x86; then - export native_install=1 - elif use amd64; then - # amd64 users may unselect the native 64bit binary, if they choose - # TODO: In future revisions, remove this ability now that 64-bit - # binaries are officially released and working. - if ! use multilib || use 64bit; then - export native_install=1 - else - unset native_install - fi - - if use multilib && use 32bit; then - export amd64_32bit=1 - else - unset amd64_32bit - fi - - if use multilib && ! use 32bit && ! use 64bit; then - eerror "You must select at least one architecture USE flag (32bit or 64bit)" - die "No library version selected [-32bit -64bit]" - fi - - unset need_lahf_wrapper - if [[ $native_install ]]; then - # 64bit flash requires the 'lahf' instruction (bug #268336) - if any_cpu_missing_flag 'lahf_lm'; then - export need_lahf_wrapper=1 - fi - fi - fi -} - -src_unpack() { - if [[ $amd64_32bit ]]; then - # Since the 32-bit and 64-bit packages collide, put the 32-bit one - # elsewhere: - local my_32b_src=${MY_32B_URI##*>} - local my_64b_src=${MY_64B_URI##*>} - if [[ $native_install ]]; then - unpack $my_64b_src - fi - mkdir 32bit - pushd 32bit >/dev/null - unpack $my_32b_src - popd >/dev/null - else - default_src_unpack - fi -} - -src_compile() { - if [[ $need_lahf_wrapper ]]; then - # This experimental wrapper, from Maks Verver via bug #268336 should - # emulate the missing lahf instruction affected platforms. - $(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \ - "${FILESDIR}/flashplugin-lahf-fix.c" \ - || die "Compile of flashplugin-lahf-fix.so failed" - fi -} - -src_install() { - if [[ $native_install ]]; then - if use x86; then - local PKGLIB=lib - else - local PKGLIB=lib64 - fi - local BASE=${INSTALL_BASE} - - # The plugin itself - exeinto /${BASE}/flash-plugin - doexe libflashplayer.so - inst_plugin /${BASE}/flash-plugin/libflashplayer.so - - # The optional KDE4 KCM plugin - if use kde; then - exeinto /${BASE}/kde4 - doexe usr/${PKGLIB}/kde4/kcm_adobe_flash_player.so - dosym /${BASE}/kde4/kcm_adobe_flash_player.so \ - /usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so - insinto /usr/share/kde4/services - doins usr/share/kde4/services/kcm_adobe_flash_player.desktop - else - # No KDE applet, so allow the GTK utility to show up in KDE: - sed -i usr/share/applications/flash-player-properties.desktop \ - -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed" - fi - - # The userland 'flash-player-properties' standalone app: - exeinto /${BASE}/bin - doexe usr/bin/flash-player-properties - dosym /${BASE}/bin/flash-player-properties \ - usr/bin/flash-player-properties - - # Icon and .desktop for 'flash-player-properties' - for icon in $(find usr/share/icons/ -name '*.png'); do - insinto /$(dirname $icon) - doins $icon - done - dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \ - usr/share/pixmaps/flash-player-properties.png - insinto usr/share/applications - sed -i usr/share/applications/flash-player-properties.desktop \ - -e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed" - doins usr/share/applications/flash-player-properties.desktop - fi - - if [[ $need_lahf_wrapper ]]; then - # This experimental wrapper, from Maks Verver via bug #268336 should - # emulate the missing lahf instruction affected platforms. - exeinto /${INSTALL_BASE} - doexe flashplugin-lahf-fix.so - inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so - fi - - if [[ $amd64_32bit ]]; then - # Only install the plugin, nothing else for 32-bit. - local oldabi="${ABI}" - ABI="x86" - - # 32b plugin - pushd "${S}/32bit" - exeinto /${INSTALL_BASE}32 - doexe libflashplayer.so - inst_plugin /${INSTALL_BASE}32/libflashplayer.so - popd - - ABI="${oldabi}" - fi - - # The magic config file! - insinto "/etc/adobe" - doins "${FILESDIR}/mms.cfg" -} - -pkg_postinst() { - if use amd64; then - if [[ $need_lahf_wrapper ]]; then - ewarn "Your processor does not support the 'lahf' instruction which is used" - ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which" - ewarn "should allow this plugin to run. If you encounter problems, please" - ewarn "adjust your USE flags to install only the 32-bit version and reinstall:" - ewarn " ${CATEGORY}/$PN[+32bit -64bit]" - elog - fi - if has_version 'www-plugins/nspluginwrapper'; then - if [[ $native_install ]]; then - # TODO: Perhaps parse the output of 'nspluginwrapper -l' - # However, the 64b flash plugin makes - # 'nspluginwrapper -l' segfault. - local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so" - if [[ -f ${FLASH_WRAPPER} ]]; then - einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed" - nspluginwrapper -r "${FLASH_WRAPPER}" - fi - else - einfo "nspluginwrapper detected: Installing plugin wrapper" - local oldabi="${ABI}" - ABI="x86" - local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so" - nspluginwrapper -i "${FLASH_SOURCE}" - ABI="${oldabi}" - fi - elif [[ ! $native_install ]]; then - elog "To use the 32-bit flash player in a native 64-bit browser," - elog "you must install www-plugins/nspluginwrapper" - fi - fi -}