diff options
29 files changed, 107 insertions, 1447 deletions
diff --git a/app-office/b2uconverter/b2uconverter-10.01.04.ebuild b/app-office/b2uconverter/b2uconverter-10.01.04.ebuild deleted file mode 100644 index a4c9bb7..0000000 --- a/app-office/b2uconverter/b2uconverter-10.01.04.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -inherit multilib - -DESCRIPTION="Converting documents from old Vietnamese encodings to Unicode" -HOMEPAGE="http://extensions.libreoffice.org/extension-center/${PN}/" -SRC_URI="http://extensions.libreoffice.org/extension-center/${PN}/releases/${PV}/${PN}-${PV}.oxt" -INSTDIR="/usr/$(get_libdir)/libreoffice/share/extensions/${PN}" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc -sparc x86" -IUSE="" -RDEPEND="virtual/ooo" -DEPEND="${RDEPEND}" - -src_compile() { -unzip ${DISTDIR}/${PN}-${PV}.oxt -d ${WORKDIR} -} -src_install() { - insinto "${INSTDIR}" - doins -r ${WORKDIR}/* -} diff --git a/app-text/gimagereader/Manifest b/app-text/gimagereader/Manifest new file mode 100644 index 0000000..c8fd1b6 --- /dev/null +++ b/app-text/gimagereader/Manifest @@ -0,0 +1,3 @@ +DIST gimagereader-0.9.tar.gz 120722 RMD160 7ed6a1a0169ea7144f84459fabf769def4db5b32 SHA1 48f955aaddda4a641f40f2a18409748a40d2d90c SHA256 eb6a358d77d1014003e34bdd0e5e42fa11f6df5269c3603d4639517f1a11d26b +EBUILD gimagereader-0.9.ebuild 629 RMD160 d8f4be25bc72383c508d8a7697e9444f1f82f84e SHA1 df6bbc5f9c847d32eb04b46cf748810609f7b379 SHA256 ce3c8e6ddc93798692bd6f7a3b1a1090c6eda212e51b30d83405ca154c5cf658 +MISC metadata.xml 230 RMD160 02ab018fdc9eec590c4b3b2f551e0a16f7733d9f SHA1 cbc47ff07a11029bed2cddabed2be537876d4a4b SHA256 2769fddd21d2e6cee2ce134e2bac3cbf4c80cf3698f937440de27d7605f76cfc diff --git a/app-text/gimagereader/gimagereader-0.9.ebuild b/app-text/gimagereader/gimagereader-0.9.ebuild new file mode 100644 index 0000000..138b0d4 --- /dev/null +++ b/app-text/gimagereader/gimagereader-0.9.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 +PYTHON_DEPEND="2" +inherit python distutils + +DESCRIPTION="A tesseract OCR front-end" +HOMEPAGE="http://www.sourceforge.com/projects/gimagereader" +SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND=" + app-text/tesseract + dev-python/gtkspell-python + dev-python/imaging + dev-python/pycairo + dev-python/pyenchant + dev-python/pygtk + dev-python/python-poppler +" +src_prepare() { + sed "/data.append/s/'COPYING',//" \ + -i setup.py +} diff --git a/app-text/gimagereader/metadata.xml b/app-text/gimagereader/metadata.xml new file mode 100644 index 0000000..2ec6d80 --- /dev/null +++ b/app-text/gimagereader/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>no-herd</herd> +<maintainer> +<email>slawomir.nizio@sabayon.org</email> +</maintainer> +</pkgmetadata> + diff --git a/gnome-extra/nautilus-terminal/Manifest b/gnome-extra/nautilus-terminal/Manifest new file mode 100644 index 0000000..01cd0ab --- /dev/null +++ b/gnome-extra/nautilus-terminal/Manifest @@ -0,0 +1,4 @@ +DIST nautilus-terminal_0.7.1_src.tar.gz 62537 RMD160 8a172694c73736dbe52cd29cb5ffb9bbab5cd8ec SHA1 74d36654d57769c0ab4e5d856f3d43750f595554 SHA256 784b736b793b5463a0dc3cdf7d91a4d917bdd9ad5af44df2df7e60be0f30a1c7 +DIST nautilus-terminal_1.0_src.tar.gz 32498 RMD160 304c3a8848c0f27f30f652dee05778810e018c48 SHA1 eca493dae373b38c93ad8d0e27b63245bc8d868f SHA256 85af4a890ba7158a7c99d82f9f05ec3e8d538f8020767dce28d10f5f2412f34b +EBUILD nautilus-terminal-0.7.1.ebuild 601 RMD160 b7fc32b805fdd48d5b43a3e7e1ce584df86dc7b2 SHA1 64228f16bab700bfa3a1651ea8d675b22eec84cd SHA256 2198ede4f9a6cbb1525ab1427b678380c54e62b8cf7d6e5b16fe5762223a2383 +EBUILD nautilus-terminal-1.0.ebuild 608 RMD160 6a7dabca34d3d772b365abf5b5e86fe1c7686e11 SHA1 b5a4db751e0f02eaf2dc438e403e57709464d563 SHA256 e7ef2a01d7b5ec9712360943702ca5a073b1099084fb00bb39c29d78ed1a74c2 diff --git a/gnome-extra/nautilus-terminal/nautilus-terminal-0.7.1.ebuild b/gnome-extra/nautilus-terminal/nautilus-terminal-0.7.1.ebuild new file mode 100644 index 0000000..496e0bc --- /dev/null +++ b/gnome-extra/nautilus-terminal/nautilus-terminal-0.7.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +inherit autotools + +DESCRIPTION="Nautilus Terminal is a terminal embedded in Nautilus" +HOMEPAGE="http://projects.flogisoft.com/nautilus-terminal/" +SRC_URI="http://projects.flogisoft.com/nautilus-terminal/download/${PN}_${PV}_src.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +RDEPEND="=gnome-base/nautilus-2* +=dev-python/nautilus-python-0.7* +x11-libs/vte[introspection] +" + +DEPEND="${EPEND}" + +S="${WORKDIR}/${PN}-${PV}" + +src_install(){ + ./install.sh -p ${D} +} + diff --git a/gnome-extra/nautilus-terminal/nautilus-terminal-1.0.ebuild b/gnome-extra/nautilus-terminal/nautilus-terminal-1.0.ebuild new file mode 100644 index 0000000..d72d0d7 --- /dev/null +++ b/gnome-extra/nautilus-terminal/nautilus-terminal-1.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +inherit autotools + +DESCRIPTION="Nautilus Terminal is a terminal embedded in Nautilus" +HOMEPAGE="http://projects.flogisoft.com/nautilus-terminal/" +SRC_URI="http://projects.flogisoft.com/nautilus-terminal/download/${PN}_${PV}_src.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=">=gnome-base/nautilus-3.2 +>=dev-python/nautilus-python-1.0 +x11-libs/vte[introspection] +" + +DEPEND="${EPEND}" + +S="${WORKDIR}/${PN}_${PV}_src" + +src_install(){ + ./install.sh -p ${D} +} + diff --git a/media-gfx/blender/files/blender-2.57-bmake.patch b/media-gfx/blender/files/blender-2.57-bmake.patch deleted file mode 100644 index b78d5a4..0000000 --- a/media-gfx/blender/files/blender-2.57-bmake.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- release/plugins/bmake 2010-03-21 17:44:20.500741049 +0100 -+++ release/plugins/bmake 2010-03-21 17:44:33.659740173 +0100 -@@ -57,10 +57,10 @@ - LDFLAGS="-Bshareable"; - elif ( test $UNAME = "Linux" ) then - CC="gcc"; -- CFLAGS="-fPIC -funsigned-char -O2"; -+# CFLAGS="-fPIC -funsigned-char -O2"; - - LD="ld"; -- LDFLAGS="-Bshareable"; -+# LDFLAGS="-Bshareable"; - elif ( test $UNAME = "SunOS" ) then - CC="cc"; - CFLAGS="-O"; diff --git a/media-gfx/blender/files/blender-2.57-desktop.patch b/media-gfx/blender/files/blender-2.57-desktop.patch deleted file mode 100644 index 6a40e3b..0000000 --- a/media-gfx/blender/files/blender-2.57-desktop.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- release/freedesktop/blender.desktop 2010-09-12 00:05:51.000000000 -0700 -+++ release/freedesktop/blender.desktop 2010-09-12 00:07:32.000000000 -0700 -@@ -1,5 +1,5 @@ - [Desktop Entry] --Name=Blender -+Name=Blender 2.5x - GenericName=3D modeller - GenericName[es]=modelador 3D - GenericName[de]=3D Modellierer -@@ -7,8 +7,8 @@ - GenericName[ru]=Редактор 3D-моделей - Comment=3D modeling, animation, rendering and post-production - Comment[es]=modelado 3D, animación, renderizado y post-producción --Exec=blender --Icon=blender -+Exec=blender-2.5 -+Icon=blender-2.5.svg - Terminal=false - Type=Application - Categories=Graphics;3DGraphics; diff --git a/media-gfx/blender/files/blender-2.57-doxygen.patch b/media-gfx/blender/files/blender-2.57-doxygen.patch deleted file mode 100644 index 335b289..0000000 --- a/media-gfx/blender/files/blender-2.57-doxygen.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- doc/doxygen/Doxyfile 2011-02-19 18:51:40.216999981 +0100 -+++ doc/doxygen/Doxyfile 2011-02-19 18:57:46.628999965 +0100 -@@ -559,26 +559,26 @@ - # The QUIET tag can be used to turn on/off the messages that are generated - # by doxygen. Possible values are YES and NO. If left blank NO is used. - --QUIET = NO -+QUIET = YES - - # The WARNINGS tag can be used to turn on/off the warning messages that are - # generated by doxygen. Possible values are YES and NO. If left blank - # NO is used. - --WARNINGS = YES -+WARNINGS = NO - - # If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings - # for undocumented members. If EXTRACT_ALL is set to YES then this flag will - # automatically be disabled. - --WARN_IF_UNDOCUMENTED = YES -+WARN_IF_UNDOCUMENTED = NO - - # If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for - # potential errors in the documentation, such as not documenting some - # parameters in a documented function, or documenting parameters that - # don't exist or using markup commands wrongly. - --WARN_IF_DOC_ERROR = YES -+WARN_IF_DOC_ERROR = NO - - # The WARN_NO_PARAMDOC option can be enabled to get warnings for - # functions that are documented, but have no documentation for their parameters diff --git a/media-gfx/blender/files/blender-2.57-eigen.patch b/media-gfx/blender/files/blender-2.57-eigen.patch deleted file mode 100644 index 91d8af4..0000000 --- a/media-gfx/blender/files/blender-2.57-eigen.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- intern/itasc/SConscript 2009-09-26 09:14:02.000000000 +0200 -+++ intern/itasc/SConscript 2009-09-26 09:14:54.000000000 +0200 -@@ -5,7 +5,8 @@ - sources += env.Glob('kdl/*.cpp') - sources += env.Glob('kdl/utilities/*.cpp') - --incs = '. ../../extern/Eigen2' -+#incs = '. ../../extern/Eigen2' -+incs = '. /usr/include/eigen2' - - env.BlenderLib ('bf_ITASC', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] ) - ---- source/blender/ikplugin/SConscript -+++ source/blender/ikplugin/SConscript -@@ -4,6 +4,6 @@ - sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') - - incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib' --incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen2' -+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen2' - - env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[180, 190] ) diff --git a/media-gfx/blender/files/blender-2.57-enable_site_module.patch b/media-gfx/blender/files/blender-2.57-enable_site_module.patch deleted file mode 100644 index c38be79..0000000 --- a/media-gfx/blender/files/blender-2.57-enable_site_module.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- source/blender/python/intern/bpy_interface.c -+++ source/blender/python/intern/bpy_interface.c -@@ -244,11 +244,6 @@ - - bpy_python_start_path(); /* allow to use our own included python */ - -- /* Python 3.2 now looks for '2.57/python/include/python3.2d/pyconfig.h' to parse -- * from the 'sysconfig' module which is used by 'site', so for now disable site. -- * alternatively we could copy the file. */ -- Py_NoSiteFlag= 1; -- - Py_Initialize(); - - // PySys_SetArgv(argc, argv); // broken in py3, not a huge deal ---- source/gameengine/Ketsji/KX_PythonInit.cpp -+++ source/gameengine/Ketsji/KX_PythonInit.cpp -@@ -1773,7 +1773,6 @@ - STR_String pname = progname; - Py_SetProgramName(pname.Ptr()); - #endif -- Py_NoSiteFlag=1; - Py_FrozenFlag=1; - - /* must run before python initializes */ -@@ -1843,7 +1842,6 @@ - STR_String pname = progname; - Py_SetProgramName(pname.Ptr()); - #endif -- Py_NoSiteFlag=1; - Py_FrozenFlag=1; - - initPyTypes(); diff --git a/media-gfx/blender/files/blender-2.57-glew.patch b/media-gfx/blender/files/blender-2.57-glew.patch deleted file mode 100644 index 5e63c7c..0000000 --- a/media-gfx/blender/files/blender-2.57-glew.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- extern/SConscript -+++ extern/SConscript -@@ -2,8 +2,6 @@ - - Import('env') - --SConscript(['glew/SConscript']) -- - if env['WITH_BF_BULLET']: - SConscript(['bullet2/src/SConscript']) - ---- source/blender/editors/include/BIF_gl.h -+++ source/blender/editors/include/BIF_gl.h -@@ -31,7 +31,7 @@ - #ifndef BIF_GL_H - #define BIF_GL_H - --#include "GL/glew.h" -+#include <GL/glew.h> - - /* - * these should be phased out. cpack should be replaced in diff --git a/media-gfx/blender/files/blender-2.57-insecure.desktop b/media-gfx/blender/files/blender-2.57-insecure.desktop deleted file mode 100644 index e427957..0000000 --- a/media-gfx/blender/files/blender-2.57-insecure.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Name=Blender 2.5x (reduced security) -GenericName=3D modeller (reduced security) -GenericName[es]=modelador 3D (reduced security) -GenericName[de]=3D Modellierer (weniger Sicherheit) -GenericName[fr]=modeleur 3D (reduced security) -GenericName[ru]=Редактор 3D-моделей (reduced security) -Comment=3D modeling, animation, rendering and post-production -Comment[es]=modelado 3D, animación, renderizado y post-producción -Exec=blender-2.5 --enable-autoexec -Icon=blender-2.5.svg -Terminal=false -Type=Application -Categories=Graphics;3DGraphics; -MimeType=application/x-blender; diff --git a/media-gfx/blender/files/blender-2.57-libav-0.7.patch b/media-gfx/blender/files/blender-2.57-libav-0.7.patch deleted file mode 100644 index 7b4ca47..0000000 --- a/media-gfx/blender/files/blender-2.57-libav-0.7.patch +++ /dev/null @@ -1,296 +0,0 @@ -diff -burN blender-2.57.orig//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp blender-2.57/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp ---- blender-2.57.orig//intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2011-04-14 17:06:35.000000000 +0200 -+++ blender-2.57/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2011-05-04 01:44:30.184004582 +0200 -@@ -64,15 +64,10 @@ - - // read samples from the packet - data_size = buf_size - buf_pos; -- /*read_length = avcodec_decode_audio3(m_codecCtx, -+ read_length = avcodec_decode_audio3(m_codecCtx, - (int16_t*)(((data_t*)buffer.getBuffer())+buf_pos), - &data_size, -- packet);*/ -- read_length = avcodec_decode_audio2(m_codecCtx, -- (int16_t*)(((data_t*)buffer.getBuffer()) + buf_pos), -- &data_size, -- audio_pkg_data, -- audio_pkg_size); -+ packet); - - // read error, next packet! - if(read_length < 0) -@@ -112,7 +107,7 @@ - - for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++) - { -- if((m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) -+ if((m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) - && (m_stream < 0)) - { - m_stream=i; -diff -burN blender-2.57.orig//source/blender/blenkernel/intern/writeffmpeg.c blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c ---- blender-2.57.orig//source/blender/blenkernel/intern/writeffmpeg.c 2011-04-14 17:17:03.000000000 +0200 -+++ blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c 2011-05-04 03:36:08.365219076 +0200 -@@ -163,7 +163,7 @@ - } - - pkt.stream_index = audio_stream->index; -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - if (av_interleaved_write_frame(outfile, &pkt) != 0) { - fprintf(stderr, "Error writing audio packet!\n"); - return -1; -@@ -290,7 +290,7 @@ - fprintf(stderr, "Video Frame PTS: not set\n"); - } - if (c->coded_frame->key_frame) -- packet.flags |= PKT_FLAG_KEY; -+ packet.flags |= AV_PKT_FLAG_KEY; - packet.stream_index = video_stream->index; - packet.data = video_buffer; - packet.size = outsize; -@@ -396,7 +396,7 @@ - switch(prop->type) { - case IDP_STRING: - fprintf(stderr, "%s.\n", IDP_String(prop)); -- rv = av_set_string(c, prop->name, IDP_String(prop)); -+ av_set_string3(c, prop->name, IDP_String(prop), 0, &rv); - break; - case IDP_FLOAT: - fprintf(stderr, "%g.\n", IDP_Float(prop)); -@@ -407,7 +407,7 @@ - - if (param) { - if (IDP_Int(prop)) { -- rv = av_set_string(c, name, param); -+ av_set_string3(c, name, param, 0, &rv); - } else { - return; - } -@@ -461,7 +461,7 @@ - - c = get_codec_from_stream(st); - c->codec_id = codec_id; -- c->codec_type = CODEC_TYPE_VIDEO; -+ c->codec_type = AVMEDIA_TYPE_VIDEO; - - - /* Get some values from the current render settings */ -@@ -519,7 +519,7 @@ - c->pix_fmt = PIX_FMT_YUV422P; - } - -- if (codec_id == CODEC_ID_XVID) { -+ if (codec_id == CODEC_ID_MPEG4) { - /* arghhhh ... */ - c->pix_fmt = PIX_FMT_YUV420P; - c->codec_tag = (('D'<<24) + ('I'<<16) + ('V'<<8) + 'X'); -@@ -588,7 +588,7 @@ - - c = get_codec_from_stream(st); - c->codec_id = codec_id; -- c->codec_type = CODEC_TYPE_AUDIO; -+ c->codec_type = AVMEDIA_TYPE_AUDIO; - - c->sample_rate = rd->ffcodecdata.audio_mixrate; - c->bit_rate = ffmpeg_audio_bitrate*1000; -@@ -666,13 +666,13 @@ - BKE_report(reports, RPT_ERROR, "No valid formats found."); - return 0; - } -- fmt = guess_format(NULL, exts[0], NULL); -+ fmt = av_guess_format(NULL, exts[0], NULL); - if (!fmt) { - BKE_report(reports, RPT_ERROR, "No valid formats found."); - return 0; - } - -- of = av_alloc_format_context(); -+ of = avformat_alloc_context(); - if (!of) { - BKE_report(reports, RPT_ERROR, "Error opening output file"); - return 0; -@@ -713,7 +713,7 @@ - fmt->video_codec = CODEC_ID_H264; - break; - case FFMPEG_XVID: -- fmt->video_codec = CODEC_ID_XVID; -+ fmt->video_codec = CODEC_ID_MPEG4; - break; - case FFMPEG_FLV: - fmt->video_codec = CODEC_ID_FLV1; -@@ -834,7 +834,7 @@ - fprintf(stderr, "Video Frame PTS: not set\n"); - } - if (c->coded_frame->key_frame) { -- packet.flags |= PKT_FLAG_KEY; -+ packet.flags |= AV_PKT_FLAG_KEY; - } - packet.stream_index = video_stream->index; - packet.data = video_buffer; -@@ -1314,7 +1314,7 @@ - case FFMPEG_PRESET_XVID: - if(preset == FFMPEG_PRESET_XVID) { - rd->ffcodecdata.type = FFMPEG_AVI; -- rd->ffcodecdata.codec = CODEC_ID_XVID; -+ rd->ffcodecdata.codec = CODEC_ID_MPEG4; - } - else if(preset == FFMPEG_PRESET_THEORA) { - rd->ffcodecdata.type = FFMPEG_OGG; // XXX broken -@@ -1357,7 +1357,7 @@ - } - } - else if(rd->imtype == R_XVID) { -- if(rd->ffcodecdata.codec != CODEC_ID_XVID) { -+ if(rd->ffcodecdata.codec != CODEC_ID_MPEG4) { - ffmpeg_set_preset(rd, FFMPEG_PRESET_XVID); - audio= 1; - } -diff -burN blender-2.57.orig//source/blender/imbuf/intern/anim_movie.c blender-2.57/source/blender/imbuf/intern/anim_movie.c ---- blender-2.57.orig//source/blender/imbuf/intern/anim_movie.c 2011-04-14 17:19:18.000000000 +0200 -+++ blender-2.57/source/blender/imbuf/intern/anim_movie.c 2011-05-04 03:33:56.724566283 +0200 -@@ -566,7 +566,7 @@ - videoStream=-1; - for(i=0; i<pFormatCtx->nb_streams; i++) - if(get_codec_from_stream(pFormatCtx->streams[i])->codec_type -- == CODEC_TYPE_VIDEO) { -+ == AVMEDIA_TYPE_VIDEO) { - videoStream=i; - break; - } -@@ -830,10 +830,10 @@ - && position - (anim->curposition + 1) < anim->preseek) { - while(av_read_frame(anim->pFormatCtx, &packet)>=0) { - if (packet.stream_index == anim->videoStream) { -- avcodec_decode_video( -+ avcodec_decode_video2( - anim->pCodecCtx, - anim->pFrame, &frameFinished, -- packet.data, packet.size); -+ &packet); - - if (frameFinished) { - anim->curposition++; -@@ -915,9 +915,9 @@ - - while(av_read_frame(anim->pFormatCtx, &packet)>=0) { - if(packet.stream_index == anim->videoStream) { -- avcodec_decode_video(anim->pCodecCtx, -+ avcodec_decode_video2(anim->pCodecCtx, - anim->pFrame, &frameFinished, -- packet.data, packet.size); -+ &packet); - - if (seek_by_bytes && preseek_count > 0) { - preseek_count--; -diff -burN blender-2.57.orig//source/blender/imbuf/intern/util.c blender-2.57/source/blender/imbuf/intern/util.c ---- blender-2.57.orig//source/blender/imbuf/intern/util.c 2011-04-14 17:19:18.000000000 +0200 -+++ blender-2.57/source/blender/imbuf/intern/util.c 2011-05-04 02:15:26.369208909 +0200 -@@ -292,7 +292,7 @@ - for(i=0; i<pFormatCtx->nb_streams; i++) - if(pFormatCtx->streams[i] && - get_codec_from_stream(pFormatCtx->streams[i]) && -- (get_codec_from_stream(pFormatCtx->streams[i])->codec_type==CODEC_TYPE_VIDEO)) -+ (get_codec_from_stream(pFormatCtx->streams[i])->codec_type==AVMEDIA_TYPE_VIDEO)) - { - videoStream=i; - break; -diff -burN blender-2.57.orig//source/blender/makesrna/intern/rna_scene.c blender-2.57/source/blender/makesrna/intern/rna_scene.c ---- blender-2.57.orig//source/blender/makesrna/intern/rna_scene.c 2011-04-14 17:18:53.000000000 +0200 -+++ blender-2.57/source/blender/makesrna/intern/rna_scene.c 2011-05-04 02:19:10.326319453 +0200 -@@ -2135,7 +2135,7 @@ - {CODEC_ID_HUFFYUV, "HUFFYUV", 0, "HuffYUV", ""}, - {CODEC_ID_DVVIDEO, "DV", 0, "DV", ""}, - {CODEC_ID_H264, "H264", 0, "H.264", ""}, -- {CODEC_ID_XVID, "XVID", 0, "Xvid", ""}, -+ {CODEC_ID_MPEG4, "XVID", 0, "Xvid", ""}, - {CODEC_ID_THEORA, "THEORA", 0, "Theora", ""}, - {CODEC_ID_FLV1, "FLASH", 0, "Flash Video", ""}, - {CODEC_ID_FFV1, "FFV1", 0, "FFmpeg video codec #1", ""}, -diff -burN blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.cpp blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.cpp ---- blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.cpp 2011-04-14 17:13:34.000000000 +0200 -+++ blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.cpp 2011-05-04 02:49:31.147348425 +0200 -@@ -182,7 +182,7 @@ - { - if(formatCtx->streams[i] && - get_codec_from_stream(formatCtx->streams[i]) && -- (get_codec_from_stream(formatCtx->streams[i])->codec_type==CODEC_TYPE_VIDEO)) -+ (get_codec_from_stream(formatCtx->streams[i])->codec_type==AVMEDIA_TYPE_VIDEO)) - { - videoStream=i; - break; -@@ -368,9 +368,9 @@ - BLI_remlink(&video->m_packetCacheBase, cachePacket); - // use m_frame because when caching, it is not used in main thread - // we can't use currentFrame directly because we need to convert to RGB first -- avcodec_decode_video(video->m_codecCtx, -+ avcodec_decode_video2(video->m_codecCtx, - video->m_frame, &frameFinished, -- cachePacket->packet.data, cachePacket->packet.size); -+ &cachePacket->packet); - if(frameFinished) - { - AVFrame * input = video->m_frame; -@@ -641,7 +641,7 @@ - if (m_captRate <= 0.f) - m_captRate = defFrameRate; - sprintf(rateStr, "%f", m_captRate); -- av_parse_video_frame_rate(&frameRate, rateStr); -+ av_parse_video_rate(&frameRate, rateStr); - // populate format parameters - // need to specify the time base = inverse of rate - formatParams.time_base.num = frameRate.den; -@@ -924,10 +924,10 @@ - { - if (packet.stream_index == m_videoStream) - { -- avcodec_decode_video( -+ avcodec_decode_video2( - m_codecCtx, - m_frame, &frameFinished, -- packet.data, packet.size); -+ &packet); - if (frameFinished) - { - m_curPosition = (long)((packet.dts-startTs) * (m_baseFrameRate*timeBase) + 0.5); -@@ -999,9 +999,9 @@ - { - if(packet.stream_index == m_videoStream) - { -- avcodec_decode_video(m_codecCtx, -+ avcodec_decode_video2(m_codecCtx, - m_frame, &frameFinished, -- packet.data, packet.size); -+ &packet); - // remember dts to compute exact frame number - dts = packet.dts; - if (frameFinished && !posFound) -diff -burN blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.h blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.h ---- blender-2.57.orig//source/gameengine/VideoTexture/VideoFFmpeg.h 2011-04-14 17:13:34.000000000 +0200 -+++ blender-2.57/source/gameengine/VideoTexture/VideoFFmpeg.h 2011-05-04 03:11:53.106002831 +0200 -@@ -34,6 +34,7 @@ - #include <libavformat/avformat.h> - #include <libavcodec/avcodec.h> - #include <libavutil/rational.h> -+#include <libavutil/parseutils.h> - #include <libswscale/swscale.h> - #include "DNA_listBase.h" - #include "BLI_threads.h" -diff -burN blender-2.57.orig/source/blender/blenkernel/intern/writeffmpeg.c /var/tmp/portage/media-gfx/blender-2.57-r1/work/blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c ---- blender-2.57.orig/source/blender/blenkernel/intern/writeffmpeg.c 2011-11-07 13:17:59.001736099 -0800 -+++ blender-2.57/source/blender/blenkernel/intern/writeffmpeg.c 2011-11-07 13:18:35.726734562 -0800 -@@ -1101,12 +1101,12 @@ - switch (o->type) { - case FF_OPT_TYPE_INT: - case FF_OPT_TYPE_INT64: -- val.i = o->default_val; -+ val.i = o->default_val.dbl; - idp_type = IDP_INT; - break; - case FF_OPT_TYPE_DOUBLE: - case FF_OPT_TYPE_FLOAT: -- val.f = o->default_val; -+ val.f = o->default_val.dbl; - idp_type = IDP_FLOAT; - break; - case FF_OPT_TYPE_STRING: diff --git a/media-gfx/blender/files/blender-2.57-linux-3.patch b/media-gfx/blender/files/blender-2.57-linux-3.patch deleted file mode 100644 index 6a96b49..0000000 --- a/media-gfx/blender/files/blender-2.57-linux-3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- SConstruct 2011-10-29 05:18:43.149564401 +0200 -+++ SConstruct 2011-10-29 05:19:37.332887017 +0200 -@@ -165,6 +165,9 @@ - if crossbuild and platform not in ('win32-vc', 'win64-vc'): - platform = 'linuxcross' - -+if platform == 'linux3': -+ platform = 'linux2' # Workaround for Linux 3.x -+ - env['OURPLATFORM'] = platform - - configfile = os.path.join("build_files", "scons", "config", platform + "-config.py") diff --git a/media-gfx/blender/files/blender-2.60a-collada.patch b/media-gfx/blender/files/blender-2.60a-collada.patch deleted file mode 100644 index 980b640..0000000 --- a/media-gfx/blender/files/blender-2.60a-collada.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source/blender/collada/SConscript 2012-01-16 19:04:02.438027832 +0100 -+++ source/blender/collada/SConscript 2012-01-16 19:03:59.787060970 +0100 -@@ -35,7 +35,7 @@ - if env['OURPLATFORM']=='darwin': - incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) - else: -- incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) -+ incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) - - if env['BF_BUILDINFO']: - defs.append('WITH_BUILDINFO') diff --git a/media-gfx/blender/files/blender.desktop b/media-gfx/blender/files/blender.desktop deleted file mode 100644 index 14cef34..0000000 --- a/media-gfx/blender/files/blender.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Blender 2.4x -Comment=3D modeling, animation, rendering and post-production. -Exec=blender -Icon=blender -Terminal=0 -Type=Application -Categories=Graphics;Application; diff --git a/media-gfx/blender/files/blender.png b/media-gfx/blender/files/blender.png Binary files differdeleted file mode 100644 index 864a97a..0000000 --- a/media-gfx/blender/files/blender.png +++ /dev/null diff --git a/media-video/bino/bino-0.9.3.ebuild b/media-video/bino/bino-0.9.3.ebuild deleted file mode 100644 index 003cf1e..0000000 --- a/media-video/bino/bino-0.9.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 -inherit eutils - -DESCRIPTION="Stereoscopic and multi-display media player" -HOMEPAGE="http://www.nongnu.org/bino/index.html" -SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=media-libs/glew-1.5.0 - media-libs/openal - x11-libs/qt-gui:4 - x11-libs/qt-core:4 - x11-libs/qt-opengl:4 - >=media-libs/libass-0.9.9 - >=virtual/ffmpeg-0.6.90" - -DEPEND="${RDEPEND}" - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # remove installed doc - rm -rf "${D}/usr/share/doc/bino" - - # documentation - dodoc AUTHORS ChangeLog INSTALL NEWS README doc/*.png doc/*.jpg - dohtml doc/bino.html - doman doc/bino.1 - doinfo doc/bino.info -} diff --git a/media-video/bino/bino-1.1.1.ebuild b/media-video/bino/bino-1.1.1.ebuild deleted file mode 100644 index e518242..0000000 --- a/media-video/bino/bino-1.1.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 -inherit eutils - -DESCRIPTION="Stereoscopic and multi-display media player" -HOMEPAGE="http://www.nongnu.org/bino/index.html" -SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="lirc" - -RDEPEND=">=media-libs/glew-1.5.0 - media-libs/openal - x11-libs/qt-gui:4 - x11-libs/qt-core:4 - x11-libs/qt-opengl:4 - >=media-libs/libass-0.9.9 - >=virtual/ffmpeg-0.6.90 - lirc? ( app-misc/lirc )" - -DEPEND="${RDEPEND}" - -src_configure() { - if use lirc; then - export liblircclient_CFLAGS="-I/usr/include/lirc" liblircclient_LIBS="-llirc_client" - fi - - default -} - - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # remove installed doc - rm -rf "${D}/usr/share/doc/bino" - - # documentation - dodoc AUTHORS ChangeLog INSTALL NEWS README doc/*.png doc/*.jpg - dohtml doc/bino.html - doman doc/bino.1 - doinfo doc/bino.info -} diff --git a/media-video/bino/bino-1.1.2.ebuild b/media-video/bino/bino-1.1.2.ebuild deleted file mode 100644 index 327d4f4..0000000 --- a/media-video/bino/bino-1.1.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 -inherit eutils - -DESCRIPTION="Stereoscopic and multi-display media player" -HOMEPAGE="http://www.nongnu.org/bino/index.html" -SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="lirc" - -RDEPEND=">=media-libs/glew-1.5.0 - media-libs/openal - x11-libs/qt-gui:4 - x11-libs/qt-core:4 - x11-libs/qt-opengl:4 - >=media-libs/libass-0.9.9 - >=media-video/ffmpeg-0.8 - lirc? ( app-misc/lirc )" - -DEPEND="${RDEPEND}" - -src_configure() { - if use lirc; then - export liblircclient_CFLAGS="-I/usr/include/lirc" liblircclient_LIBS="-llirc_client" - fi - - econf -} - - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # remove installed doc - rm -rf "${D}/usr/share/doc/bino" - - # documentation - dodoc AUTHORS ChangeLog INSTALL NEWS README doc/*.png doc/*.jpg - dohtml doc/bino.html - doman doc/bino.1 - doinfo doc/bino.info -} diff --git a/media-video/openshot/openshot-1.4.1.ebuild b/media-video/openshot/openshot-1.4.1.ebuild deleted file mode 100644 index 073fdf8..0000000 --- a/media-video/openshot/openshot-1.4.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -PYTHON_DEPEND=2:2.5 -PYTHON_USE_WITH=xml - -inherit versionator distutils fdo-mime python - -DESCRIPTION="OpenShot Video Editor is a non-linear video editor" -HOMEPAGE="http://www.openshotvideo.com" -SRC_URI="http://launchpad.net/openshot/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND=" - >=x11-libs/gtk+-2.18:2 - dev-python/pygtk - dev-python/pygoocanvas - dev-python/pyxdg - dev-python/librsvg-python - dev-python/httplib2 - >=media-libs/mlt-0.4.6-r1[ffmpeg,frei0r,gtk,melt,python,sdl,xml] - media-sound/sox[encode,ffmpeg] - >=virtual/ffmpeg-0.6[encode,sdl] - dev-python/imaging - " -#>=virtual/ffmpeg-0.6[encode,faac?,ieee1394?,mp3?,sdl,theora?,vorbis?,vpx,x264?,xvid?] -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - python_convert_shebangs -q -r 2 . - distutils_src_prepare - - # Disable the installation of the mime.types file. - # The .desktop file would be used to update the mime database. - sed -ie '/launcher/,+1d' setup.py || die - - # Avoid stuff covered by fdo-mime.eclass - # (update-mime-database update-desktop-database update-mime) - # export "FAKEROOTKEY=gentoo" does not work as this variable is filtered - # by portage - sed -ie '/FAILED = /,$d' setup.py || die -} - -# TODO: check stuff installed to /usr/lib/python2.6/site-packages as there are -# some parts installed which shouldn't (locale, themes, profiles effects, -# etc...) Afaik only python stuff should go there and the rest probably to -# /usr/share/openshot -# The same goes for /usr/lib/mime/packages - -pkg_postinst() { - fdo-mime_mime_database_update - fdo-mime_desktop_database_update - distutils_pkg_postinst -} - -pkg_postrm() { - fdo-mime_mime_database_update - fdo-mime_desktop_database_update - distutils_pkg_postrm -} diff --git a/media-video/umplayer/ChangeLog b/media-video/umplayer/ChangeLog deleted file mode 100644 index 8bdb5eb..0000000 --- a/media-video/umplayer/ChangeLog +++ /dev/null @@ -1,12 +0,0 @@ -# ChangeLog for media-video/umplayer -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 02 Jul 2011; microcai <microcai@fedoraproject.org> umplayer-0.95.ebuild: - update umplayer ebuild build method - -*umplayer-0.95 (02 Jul 2011) - - 02 Jul 2011; microcai <microcai@fedoraproject.org> +umplayer-0.95.ebuild: - add umplayer - diff --git a/media-video/umplayer/umplayer-0.95.ebuild b/media-video/umplayer/umplayer-0.95.ebuild deleted file mode 100644 index 5fda2ca..0000000 --- a/media-video/umplayer/umplayer-0.95.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -inherit qt4-r2 subversion - -DESCRIPTION="UMPlayer is cross-platform and installer packages are available for -the Windows, Mac and GNU / Linux operating systems. It is completely free to use -and distribute so feel free to share UMPlayer with all your friends." -HOMEPAGE="http://www.umplayer.com" -SRC_URI="" - -ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${PN}/${PN}/trunk@r172" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~86 ~mingw32" -IUSE="" - -RDEPEND=" -" -DEPEND="${RDEPEND}" - -src_prepare() { - sed -i -e 's/\$(QMAKE).\$(QMAKE_OPTS).\&\&.//' Makefile || die "Sed failed!" - sed -i -e 's/PREFIX=\/usr\/local/PREFIX=\/usr/' Makefile || die "Sed failed!" -} - -src_configure() { - cd src/ - eqmake4 -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install || die -} - diff --git a/net-misc/networkmanager/files/networkmanager-0.8.4-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-0.8.4-fix-tests.patch deleted file mode 100644 index d8af30f..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.4-fix-tests.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 21e7fda25507e68c13b97040b3b9e5dc3c9726bf Mon Sep 17 00:00:00 2001 -From: Mu Qiao <qiaomuf@gentoo.org> -Date: Wed, 18 May 2011 19:02:40 +0800 -Subject: [PATCH] fix-tests - ---- - configure.ac | 1 - - system-settings/plugins/ifnet/Makefile.am | 1 - - system-settings/plugins/ifnet/tests/Makefile.am | 13 ------------- - 3 files changed, 0 insertions(+), 15 deletions(-) - delete mode 100644 system-settings/plugins/ifnet/tests/Makefile.am - -diff --git a/configure.ac b/configure.ac -index d8a266e..8304aa4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -571,7 +571,6 @@ system-settings/plugins/Makefile - system-settings/plugins/ifupdown/Makefile - system-settings/plugins/ifupdown/tests/Makefile - system-settings/plugins/ifnet/Makefile --system-settings/plugins/ifnet/tests/Makefile - system-settings/plugins/ifcfg-rh/Makefile - system-settings/plugins/ifcfg-rh/tests/Makefile - system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile -diff --git a/system-settings/plugins/ifnet/Makefile.am b/system-settings/plugins/ifnet/Makefile.am -index 86d5ea2..f61e112 100644 ---- a/system-settings/plugins/ifnet/Makefile.am -+++ b/system-settings/plugins/ifnet/Makefile.am -@@ -1,4 +1,3 @@ --SUBDIRS = . tests - INCLUDES = \ - -I$(top_srcdir)/src/system-settings \ - -I$(top_srcdir)/include \ -diff --git a/system-settings/plugins/ifnet/tests/Makefile.am b/system-settings/plugins/ifnet/tests/Makefile.am -deleted file mode 100644 -index 17a081f..0000000 ---- a/system-settings/plugins/ifnet/tests/Makefile.am -+++ /dev/null -@@ -1,13 +0,0 @@ --INCLUDES=-I$(top_srcdir)/system-settings/plugins/ifnet\ -- -I$(top_srcdir)/libnm-glib \ -- -I$(top_srcdir)/libnm-util \ -- -I$(top_srcdir)/include \ -- -I$(top_srcdir)/src/system-settings --TESTS = check_ifnet --check_PROGRAMS = check_ifnet --check_ifnet_SOURCES = test_all.c --check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS) --check_ifnet_LDADD = $(top_srcdir)/libnm-util/libnm-util.la\ -- $(top_srcdir)/system-settings/plugins/ifnet/lib-ifnet-io.la\ -- $(CHECK_LIBS)\ -- $(GLIB_LIBS) --- -1.7.3.4 - diff --git a/net-misc/networkmanager/files/networkmanager-0.8.4-ifnet-smarter-write.patch b/net-misc/networkmanager/files/networkmanager-0.8.4-ifnet-smarter-write.patch deleted file mode 100644 index ff4c1f2..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.4-ifnet-smarter-write.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 776fafc133e18df48dc92a717c662e1b2858567e Mon Sep 17 00:00:00 2001 -From: Mu Qiao <qiaomuf@gentoo.org> -Date: Fri, 25 Feb 2011 16:25:07 +0000 -Subject: [PATCH 3/3] Won't write when nothing changed - Signed-off-by: Mu Qiao <qiaomuf@gentoo.org> - Make log less excessive, accept non-alnum ssid (bug #356337) - -Signed-off-by: Mu Qiao <qiaomuf@gentoo.org> ---- - system-settings/plugins/ifnet/connection_parser.c | 33 +++++++++----------- - system-settings/plugins/ifnet/net_parser.c | 8 ++++- - system-settings/plugins/ifnet/plugin.c | 4 -- - system-settings/plugins/ifnet/wpa_parser.c | 7 +++- - 4 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c -index 9b5ddc1..4ac2173 100644 ---- a/system-settings/plugins/ifnet/connection_parser.c -+++ b/system-settings/plugins/ifnet/connection_parser.c -@@ -55,9 +55,16 @@ update_connection_id (NMConnection * connection, gchar * conn_name) - gchar *idstr = NULL; - gchar *uuid_base = NULL; - gchar *uuid = NULL; -+ int name_len; - NMSettingConnection *setting; - -- idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name); -+ name_len = strlen (conn_name); -+ if ((name_len > 2) && (g_str_has_prefix (conn_name, "0x"))) { -+ gchar * conn_name_printable = utils_hexstr2bin (conn_name + 2, name_len - 2); -+ idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name_printable); -+ g_free (conn_name_printable); -+ } else -+ idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name); - uuid_base = idstr; - uuid = nm_utils_uuid_generate_from_string (uuid_base); - setting = -@@ -627,23 +634,13 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error) - g_object_set (ip4_setting, - NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, - TRUE, NULL); -- if (nm_setting_ip4_config_add_address -- (ip4_setting, ip4_addr)) { -- PLUGIN_PRINT (IFNET_PLUGIN_NAME, -- "new address: %d", iblock->ip); -- PLUGIN_PRINT (IFNET_PLUGIN_NAME, -- "ipv4 addresses count: %d", -- nm_setting_ip4_config_get_num_addresses -- (ip4_setting)); -- } else { -- PLUGIN_WARN (IFNET_PLUGIN_NAME, -- "ignoring duplicate IP4 address"); -- } -+ if (!nm_setting_ip4_config_add_address (ip4_setting, ip4_addr)) -+ PLUGIN_WARN (IFNET_PLUGIN_NAME, -+ "ignoring duplicate IP4 address"); - nm_ip4_address_unref (ip4_addr); - current_iblock = iblock; - iblock = iblock->next; - destroy_ip_block (current_iblock); -- - } - g_object_set (ip4_setting, - NM_SETTING_IP4_CONFIG_METHOD, -@@ -2276,11 +2273,12 @@ write_wireless_setting (NMConnection * connection, - return FALSE; - } - -- /* If the SSID contains any non-printable characters, we need to use the -- * hex notation of the SSID instead. -+ /* If the SSID contains any non-alnum characters, we need to use -+ * the hex notation of the SSID instead. (Because openrc doesn't -+ * support these characters, see bug #356337) - */ - for (i = 0; i < ssid->len; i++) { -- if (!isprint (ssid->data[i])) { -+ if (!isalnum (ssid->data[i])) { - hex_ssid = TRUE; - break; - } -@@ -2487,7 +2485,6 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name, - ifnet_set_data (conn_name, "config", "dhcp"); - - /* DNS Servers */ -- ifnet_set_data (conn_name, "dns_servers", NULL); - num = nm_setting_ip4_config_get_num_dns (s_ip4); - if (num > 0) { - dns = g_string_new (NULL); -diff --git a/system-settings/plugins/ifnet/net_parser.c b/system-settings/plugins/ifnet/net_parser.c -index de2db8a..57f3688 100644 ---- a/system-settings/plugins/ifnet/net_parser.c -+++ b/system-settings/plugins/ifnet/net_parser.c -@@ -411,12 +411,16 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value) - } - /* Remove existing key value pair */ - if (g_hash_table_lookup_extended (conn, key, &orin_key, &orin_value)) { -- if (new_value && !strcmp (orin_value, new_value)) -+ if (new_value && !strcmp (orin_value, new_value)){ -+ g_free (new_value); - return; -+ } - g_hash_table_remove (conn, orin_key); - g_free (orin_key); - g_free (orin_value); -- } -+ /* old key/value doesn't exist but new value is NULL */ -+ } else if (!value) -+ return; - if (new_value) - g_hash_table_insert (conn, g_strdup (key), new_value); - net_parser_data_changed = TRUE; -diff --git a/system-settings/plugins/ifnet/plugin.c b/system-settings/plugins/ifnet/plugin.c -index 94f9e79..3952e91 100644 ---- a/system-settings/plugins/ifnet/plugin.c -+++ b/system-settings/plugins/ifnet/plugin.c -@@ -91,8 +91,6 @@ update_system_hostname (gpointer config) - { - SCPluginIfnetPrivate *priv = SC_PLUGIN_IFNET_GET_PRIVATE (config); - -- PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Updating hostname"); -- - if (priv->hostname) - g_free (priv->hostname); - priv->hostname = read_hostname (IFNET_SYSTEM_HOSTNAME_FILE); -@@ -184,8 +182,6 @@ monitor_file_changes (const char *filename, - info); - g_signal_connect (monitor, "changed", G_CALLBACK (file_changed), - info); -- PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Monitoring %s", filename); -- - } else - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Monitoring %s failed, error: %s", filename, -diff --git a/system-settings/plugins/ifnet/wpa_parser.c b/system-settings/plugins/ifnet/wpa_parser.c -index 42c52c3..338c338 100644 ---- a/system-settings/plugins/ifnet/wpa_parser.c -+++ b/system-settings/plugins/ifnet/wpa_parser.c -@@ -463,12 +463,15 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value) - /* Remove old key value pairs */ - if (g_hash_table_lookup_extended - (security, key, &orig_key, &orig_value)) { -- if (new_value && !strcmp(orig_value, new_value)) -+ if (new_value && !strcmp(orig_value, new_value)){ -+ g_free (new_value); - return; -+ } - g_hash_table_remove (security, orig_key); - g_free (orig_key); - g_free (orig_value); -- } -+ } else if (!value) -+ return; - - /* Add new key value */ - if (new_value) --- -1.7.3.4 - diff --git a/net-misc/networkmanager/files/networkmanager-0.8.4-shared-connection.patch b/net-misc/networkmanager/files/networkmanager-0.8.4-shared-connection.patch deleted file mode 100644 index 3ce883a..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.4-shared-connection.patch +++ /dev/null @@ -1,458 +0,0 @@ -From d252fad6aa69aefa17b592111c2db23864f63907 Mon Sep 17 00:00:00 2001 -From: Mu Qiao <qiaomuf@gentoo.org> -Date: Tue, 25 Jan 2011 10:31:53 +0000 -Subject: [PATCH] shared-connection - -Signed-off-by: Mu Qiao <qiaomuf@gentoo.org> ---- - system-settings/plugins/ifnet/connection_parser.c | 90 ++++++++++++++------ - system-settings/plugins/ifnet/net_parser.c | 55 +++++++----- - system-settings/plugins/ifnet/net_parser.h | 4 +- - system-settings/plugins/ifnet/net_utils.c | 6 +- - .../plugins/ifnet/nm-ifnet-connection.c | 8 +- - system-settings/plugins/ifnet/wpa_parser.c | 21 +++-- - 6 files changed, 122 insertions(+), 62 deletions(-) - -diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c -index f9fae51..9b5ddc1 100644 ---- a/system-settings/plugins/ifnet/connection_parser.c -+++ b/system-settings/plugins/ifnet/connection_parser.c -@@ -557,7 +557,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error) - - NMSettingIP4Config *ip4_setting = - NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ()); -- gchar *value; -+ gchar *value, *method = NULL; - gboolean is_static_block = is_static_ip4 (conn_name); - ip_block *iblock = NULL; - -@@ -569,13 +569,41 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error) - && strstr (value, "nogateway") ? TRUE : FALSE, NULL); - - if (!is_static_block) { -- g_object_set (ip4_setting, -- NM_SETTING_IP4_CONFIG_METHOD, -- NM_SETTING_IP4_CONFIG_METHOD_AUTO, -- NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL); -- PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using DHCP for %s", -- conn_name); -- } else { -+ method = ifnet_get_data (conn_name, "config"); -+ if (!method){ -+ g_set_error (error, ifnet_plugin_error_quark (), 0, -+ "Unknown config for %s", conn_name); -+ g_object_unref (ip4_setting); -+ return; -+ } -+ if (!strcmp (method, "dhcp")) -+ g_object_set (ip4_setting, -+ NM_SETTING_IP4_CONFIG_METHOD, -+ NM_SETTING_IP4_CONFIG_METHOD_AUTO, -+ NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL); -+ else if (!strcmp (method, "autoip")){ -+ g_object_set (ip4_setting, -+ NM_SETTING_IP4_CONFIG_METHOD, -+ NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL, -+ NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL); -+ nm_connection_add_setting (connection, NM_SETTING (ip4_setting)); -+ return; -+ } else if (!strcmp (method, "shared")){ -+ g_object_set (ip4_setting, -+ NM_SETTING_IP4_CONFIG_METHOD, -+ NM_SETTING_IP4_CONFIG_METHOD_SHARED, -+ NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL); -+ nm_connection_add_setting (connection, NM_SETTING (ip4_setting)); -+ return; -+ } else { -+ g_set_error (error, ifnet_plugin_error_quark (), 0, -+ "Unknown config for %s", conn_name); -+ g_object_unref (ip4_setting); -+ return; -+ } -+ PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using %s method for %s", -+ method, conn_name); -+ }else { - iblock = convert_ip4_config_block (conn_name); - if (!iblock) { - g_set_error (error, ifnet_plugin_error_quark (), 0, -@@ -625,7 +653,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error) - } - - /* add dhcp hostname and client id */ -- if (!is_static_block) { -+ if (method && !strcmp (method, "dhcp")) { - gchar *dhcp_hostname, *client_id; - - get_dhcp_hostname_and_client_id (&dhcp_hostname, &client_id); -@@ -712,7 +740,6 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error) - iblock = iblock->next; - destroy_ip_block (current_iblock); - } -- - /* Finally add setting to connection */ - nm_connection_add_setting (connection, NM_SETTING (ip4_setting)); - } -@@ -1243,10 +1270,10 @@ parse_wpa_psk (gchar * psk, GError ** error) - * the passphrase contains spaces. - */ - -- p = psk; -- if (p[0] == '"' && psk[strlen (psk) - 1] == '"') -+ p = g_strdup (psk); -+ if (p[0] == '"' && p[strlen (p) - 1] == '"') - quoted = TRUE; -- if (!quoted && (strlen (psk) == 64)) { -+ if (!quoted && (strlen (p) == 64)) { - /* Verify the hex PSK; 64 digits */ - if (!is_hex (p)) { - g_set_error (error, ifnet_plugin_error_quark (), -@@ -1254,7 +1281,7 @@ parse_wpa_psk (gchar * psk, GError ** error) - "Invalid WPA_PSK (contains non-hexadecimal characters)"); - goto out; - } -- hashed = g_strdup (psk); -+ hashed = g_strdup (p); - } else { - strip_string (p, '"'); - -@@ -1276,6 +1303,7 @@ parse_wpa_psk (gchar * psk, GError ** error) - } - - out: -+ g_free (p); - return hashed; - } - -@@ -2085,7 +2113,8 @@ write_wireless_security_setting (NMConnection * connection, - } else if (!strcmp (key_mgmt, "wpa-eap")) { - wpa_set_data (conn_name, "key_mgmt", "WPA-EAP"); - wpa = TRUE; -- } -+ } else -+ PLUGIN_WARN (IFNET_PLUGIN_NAME, "Unknown key_mgmt: %s", key_mgmt); - - if (auth_alg) { - if (!strcmp (auth_alg, "shared")) -@@ -2180,8 +2209,11 @@ write_wireless_security_setting (NMConnection * connection, - g_string_append (quoted, psk); - g_string_append_c (quoted, '"'); - } -- wpa_set_data (conn_name, "psk", -- quoted ? quoted->str : (gchar *) psk); -+ if (psk) -+ wpa_set_data (conn_name, "psk", -+ quoted ? quoted->str : (gchar *) psk); -+ else -+ PLUGIN_WARN (IFNET_PLUGIN_NAME, "Use WPA, but no psk received from NM"); - if (quoted) - g_string_free (quoted, TRUE); - } else -@@ -2190,15 +2222,19 @@ write_wireless_security_setting (NMConnection * connection, - return TRUE; - } - --/* remove old ssid and add new one*/ -+/* Only remove old config when ssid is changed. -+ * See bug #350476. -+ * */ - static void - update_wireless_ssid (NMConnection * connection, gchar * conn_name, - gchar * ssid, gboolean hex) - { -- ifnet_delete_network (conn_name); -- ifnet_add_connection (ssid, "wireless"); -+ if (strcmp (conn_name, ssid)){ -+ ifnet_delete_network (conn_name); -+ wpa_delete_security (conn_name); -+ } - -- wpa_delete_security (conn_name); -+ ifnet_add_network (ssid, "wireless"); - wpa_add_security (ssid); - } - -@@ -2443,7 +2479,11 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name, - } - ifnet_set_data (conn_name, "config", ips->str); - g_string_free (ips, TRUE); -- } else -+ } else if (!strcmp (value, NM_SETTING_IP4_CONFIG_METHOD_SHARED)) -+ ifnet_set_data (conn_name, "config", "shared"); -+ else if (!strcmp (value, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL)) -+ ifnet_set_data (conn_name, "config", "autoip"); -+ else - ifnet_set_data (conn_name, "config", "dhcp"); - - /* DNS Servers */ -@@ -2858,7 +2898,7 @@ get_wired_name () - for (; i < 256; i++) { - gchar *conn_name = g_strdup_printf ("eth%d", i); - -- if (!ifnet_has_connection (conn_name)) { -+ if (!ifnet_has_network (conn_name)) { - return conn_name; - } else - g_free (conn_name); -@@ -2875,7 +2915,7 @@ get_ppp_name () - for (; i < 256; i++) { - gchar *conn_name = g_strdup_printf ("ppp%d", i); - -- if (!ifnet_has_connection (conn_name)) { -+ if (!ifnet_has_network (conn_name)) { - return conn_name; - } else - g_free (conn_name); -@@ -2982,7 +3022,7 @@ ifnet_add_new_connection (NMConnection * connection, - goto out; - } - -- if (ifnet_add_connection (new_name, new_type)) -+ if (ifnet_add_network (new_name, new_type)) - success = - ifnet_update_parsers_by_connection (connection, new_name, - NULL, config_file, -diff --git a/system-settings/plugins/ifnet/net_parser.c b/system-settings/plugins/ifnet/net_parser.c -index b4a381d..de2db8a 100644 ---- a/system-settings/plugins/ifnet/net_parser.c -+++ b/system-settings/plugins/ifnet/net_parser.c -@@ -37,6 +37,9 @@ static GList *functions_list; - /* Used to decide whether to write changes to file*/ - static gboolean net_parser_data_changed = FALSE; - -+static void -+destroy_connection_config (GHashTable * conn); -+ - static GHashTable * - add_new_connection_config (const gchar * type, const gchar * name) - { -@@ -58,8 +61,10 @@ add_new_connection_config (const gchar * type, const gchar * name) - } - - gboolean --ifnet_add_connection (gchar * name, gchar * type) -+ifnet_add_network (gchar * name, gchar * type) - { -+ if (ifnet_has_network (name)) -+ return TRUE; - if (add_new_connection_config (type, name)) { - PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Adding network for %s", name); - net_parser_data_changed = TRUE; -@@ -69,11 +74,27 @@ ifnet_add_connection (gchar * name, gchar * type) - } - - gboolean --ifnet_has_connection (gchar * conn_name) -+ifnet_has_network (gchar * conn_name) - { - return g_hash_table_lookup (conn_table, conn_name) != NULL; - } - -+gboolean -+ifnet_delete_network (gchar * conn_name) -+{ -+ GHashTable *network = NULL; -+ -+ g_return_val_if_fail (conn_table != NULL && conn_name != NULL, FALSE); -+ PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Deleting network for %s", conn_name); -+ network = g_hash_table_lookup (conn_table, conn_name); -+ if (!network) -+ return FALSE; -+ g_hash_table_remove (conn_table, conn_name); -+ destroy_connection_config (network); -+ net_parser_data_changed = TRUE; -+ return TRUE; -+} -+ - static GHashTable * - get_connection_config (gchar * name) - { -@@ -377,21 +398,27 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value) - { - gpointer orin_key = NULL, orin_value = NULL; - GHashTable *conn = g_hash_table_lookup (conn_table, conn_name); -+ gchar *new_value = NULL; - - if (!conn) { - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "%s does not exsit!", conn_name); - return; - } -+ if (value){ -+ new_value = g_strdup (value); -+ strip_string (new_value, '"'); -+ } - /* Remove existing key value pair */ - if (g_hash_table_lookup_extended (conn, key, &orin_key, &orin_value)) { -+ if (new_value && !strcmp (orin_value, new_value)) -+ return; - g_hash_table_remove (conn, orin_key); - g_free (orin_key); - g_free (orin_value); - } -- if (value) -- g_hash_table_insert (conn, g_strdup (key), -- strip_string (g_strdup (value), '"')); -+ if (new_value) -+ g_hash_table_insert (conn, g_strdup (key), new_value); - net_parser_data_changed = TRUE; - } - -@@ -467,7 +494,7 @@ ifnet_flush_to_file (gchar * config_file) - gboolean result = FALSE; - - if (!net_parser_data_changed) -- return FALSE; -+ return TRUE; - if (!conn_table || !global_settings_table) - return FALSE; - -@@ -583,22 +610,6 @@ ifnet_flush_to_file (gchar * config_file) - return result; - } - --gboolean --ifnet_delete_network (gchar * conn_name) --{ -- GHashTable *network = NULL; -- -- g_return_val_if_fail (conn_table != NULL && conn_name != NULL, FALSE); -- PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Deleting network for %s", conn_name); -- network = g_hash_table_lookup (conn_table, conn_name); -- if (!network) -- return FALSE; -- g_hash_table_remove (conn_table, conn_name); -- destroy_connection_config (network); -- net_parser_data_changed = TRUE; -- return TRUE; --} -- - void - ifnet_destroy (void) - { -diff --git a/system-settings/plugins/ifnet/net_parser.h b/system-settings/plugins/ifnet/net_parser.h -index 73a44c8..b71a01f 100644 ---- a/system-settings/plugins/ifnet/net_parser.h -+++ b/system-settings/plugins/ifnet/net_parser.h -@@ -36,11 +36,11 @@ GList *ifnet_get_connection_names (void); - gchar *ifnet_get_data (gchar * conn_name, const gchar * key); - gchar *ifnet_get_global_data (const gchar * key); - gchar *ifnet_get_global_setting (gchar * group, gchar * key); --gboolean ifnet_has_connection (gchar * conn_name); -+gboolean ifnet_has_network (gchar * conn_name); - - /* Writer functions */ - gboolean ifnet_flush_to_file (gchar * config_file); - void ifnet_set_data (gchar * conn_name, gchar * key, gchar * value); --gboolean ifnet_add_connection (gchar * name, gchar * type); -+gboolean ifnet_add_network (gchar * name, gchar * type); - gboolean ifnet_delete_network (gchar * conn_name); - #endif -diff --git a/system-settings/plugins/ifnet/net_utils.c b/system-settings/plugins/ifnet/net_utils.c -index 2dc253c..83b4325 100644 ---- a/system-settings/plugins/ifnet/net_utils.c -+++ b/system-settings/plugins/ifnet/net_utils.c -@@ -278,6 +278,10 @@ is_static_ip4 (gchar * conn_name) - - if (!data) - return FALSE; -+ if (!strcmp (data, "shared")) -+ return FALSE; -+ if (!strcmp (data, "autoip")) -+ return FALSE; - dhcp6 = strstr (data, "dhcp6"); - if (dhcp6) { - gchar *dhcp4; -@@ -942,8 +946,8 @@ get_dhcp_hostname_and_client_id (char **hostname, char **client_id) - else if ((tmp = strstr (line, "send host-name")) != NULL) { - tmp += strlen ("send host-name"); - g_strstrip (tmp); -- strip_string (tmp, '"'); - strip_string (tmp, ';'); -+ strip_string (tmp, '"'); - if (tmp[0] != '\0') - *hostname = g_strdup (tmp); - else -diff --git a/system-settings/plugins/ifnet/nm-ifnet-connection.c b/system-settings/plugins/ifnet/nm-ifnet-connection.c -index e47495c..ebe2581 100644 ---- a/system-settings/plugins/ifnet/nm-ifnet-connection.c -+++ b/system-settings/plugins/ifnet/nm-ifnet-connection.c -@@ -71,12 +71,14 @@ nm_ifnet_connection_new (gchar * conn_name) - { - NMConnection *tmp; - GObject *object; -- GError **error = NULL; -+ GError *error = NULL; - - g_return_val_if_fail (conn_name != NULL, NULL); -- tmp = ifnet_update_connection_from_config_block (conn_name, error); -- if (!tmp) -+ tmp = ifnet_update_connection_from_config_block (conn_name, &error); -+ if (!tmp){ -+ g_error_free (error); - return NULL; -+ } - object = (GObject *) g_object_new (NM_TYPE_IFNET_CONNECTION, - NM_IFNET_CONNECTION_CONN_NAME, - conn_name, NULL); -diff --git a/system-settings/plugins/ifnet/wpa_parser.c b/system-settings/plugins/ifnet/wpa_parser.c -index 5e94108..42c52c3 100644 ---- a/system-settings/plugins/ifnet/wpa_parser.c -+++ b/system-settings/plugins/ifnet/wpa_parser.c -@@ -366,7 +366,7 @@ wpa_flush_to_file (gchar * config_file) - gboolean result = FALSE; - - if (!wpa_parser_data_changed) -- return FALSE; -+ return TRUE; - if (!wsec_table || !wsec_global_table) - return FALSE; - -@@ -450,26 +450,29 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value) - { - gpointer orig_key = NULL, orig_value = NULL; - GHashTable *security = g_hash_table_lookup (wsec_table, ssid); -+ gchar *new_value = NULL; - - g_return_if_fail (security != NULL); - -+ if (value){ -+ new_value = g_strdup(value); -+ if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0 -+ && !g_str_has_prefix (key, "wep_key")) -+ strip_string (new_value, '"'); -+ } - /* Remove old key value pairs */ - if (g_hash_table_lookup_extended - (security, key, &orig_key, &orig_value)) { -+ if (new_value && !strcmp(orig_value, new_value)) -+ return; - g_hash_table_remove (security, orig_key); - g_free (orig_key); - g_free (orig_value); - } - - /* Add new key value */ -- if (value) { -- gchar *new_value = g_strdup (value); -- -- if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0 -- && !g_str_has_prefix (key, "wep_key")) -- strip_string (new_value, '"'); -+ if (new_value) - g_hash_table_insert (security, g_strdup (key), new_value); -- } - wpa_parser_data_changed = TRUE; - } - -@@ -483,7 +486,7 @@ gboolean - wpa_add_security (gchar * ssid) - { - if (wpa_has_security (ssid)) -- return FALSE; -+ return TRUE; - else { - GHashTable *security = - g_hash_table_new (g_str_hash, g_str_equal); --- -1.7.3.4 - diff --git a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet b/net-misc/networkmanager/files/nm-system-settings.conf-ifnet deleted file mode 100644 index 4d14ee7..0000000 --- a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet +++ /dev/null @@ -1,6 +0,0 @@ -[main] -plugins=ifnet,keyfile - -[ifnet] -managed=true -auto_refresh=false |
